Skip to content
This repository was archived by the owner on Jul 15, 2021. It is now read-only.

Commit 8836156

Browse files
committed
added minified copies of bundle to dist and demo directories. added tasks to switch between minified and normal bundle in the demo/index.html file. refs #2
1 parent 6253875 commit 8836156

File tree

9 files changed

+749
-672
lines changed

9 files changed

+749
-672
lines changed

Gruntfile.js

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,49 @@ module.exports = function(grunt) {
121121
'index.js', 'src/*.js', 'src/*.pegjs', 'demo/js/*.js',
122122
'Gruntfile.js', 'demo/css/demo.css', 'demo/index.html'
123123
],
124-
tasks: ['demo']
124+
tasks: ['default', 'clean:demo', 'browserify:demo', 'copy:demo']
125+
}
126+
},
127+
uglify: {
128+
dist: {
129+
files: {
130+
'dist/sqlite-parser-min.js': ['dist/sqlite-parser.js']
131+
}
132+
},
133+
demo: {
134+
files: {
135+
'demo/sqlite-parser-demo-min.js': ['demo/sqlite-parser-demo.js']
136+
}
137+
}
138+
},
139+
'string-replace': {
140+
demo: {
141+
files: {
142+
'demo/index.html': 'demo/index.html'
143+
},
144+
options: {
145+
replacements: [
146+
// place files inline example
147+
{
148+
pattern: '<script src="sqlite-parser-demo.js"></script>',
149+
replacement: '<script src="sqlite-parser-demo-min.js"></script>'
150+
}
151+
]
152+
}
153+
},
154+
interactive: {
155+
files: {
156+
'demo/index.html': 'demo/index.html'
157+
},
158+
options: {
159+
replacements: [
160+
// place files inline example
161+
{
162+
pattern: '<script src="sqlite-parser-demo-min.js"></script>',
163+
replacement: '<script src="sqlite-parser-demo.js"></script>'
164+
}
165+
]
166+
}
125167
}
126168
}
127169
});
@@ -132,17 +174,19 @@ module.exports = function(grunt) {
132174
grunt.loadNpmTasks('grunt-contrib-copy');
133175
grunt.loadNpmTasks('grunt-browserify');
134176
grunt.loadNpmTasks('grunt-contrib-connect');
177+
grunt.loadNpmTasks('grunt-contrib-uglify');
178+
grunt.loadNpmTasks('grunt-string-replace');
135179

136180
grunt.registerTask('default', ['clean:main', 'shell:pegjs', 'copy:main']);
137181
grunt.registerTask('test', ['default', 'shell:test']);
138182
grunt.registerTask('debug', ['default', 'shell:debug', 'watch:debug']);
139183
grunt.registerTask('json', ['default', 'shell:json']);
140184
grunt.registerTask('demo', [
141-
'default', 'clean:demo', 'browserify:demo', 'copy:demo'
185+
'default', 'clean:demo', 'browserify:demo', 'copy:demo', 'uglify:demo', 'string-replace:demo'
142186
]);
143187
grunt.registerTask('interactive', [
144-
'demo', 'connect:server', 'watch:demo'
188+
'default', 'clean:demo', 'browserify:demo', 'copy:demo', 'string-replace:interactive', 'connect:server', 'watch:demo'
145189
]);
146-
grunt.registerTask('dist', ['default', 'clean:dist', 'browserify:dist']);
190+
grunt.registerTask('dist', ['default', 'clean:dist', 'browserify:dist', 'uglify:dist']);
147191
grunt.registerTask('release', ['test', 'dist', 'demo']);
148192
};

demo/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ <h3>
5959
</footer>
6060

6161
<!-- CodeMirror Setup -->
62-
<script src="sqlite-parser-demo.js"></script>
62+
<script src="sqlite-parser-demo-min.js"></script>
6363
</body>
6464
</html>

demo/sqlite-parser-demo-min.js

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/sqlite-parser-demo.js

Lines changed: 217 additions & 217 deletions
Large diffs are not rendered by default.

dist/sqlite-parser-min.js

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/sqlite-parser.js

Lines changed: 217 additions & 217 deletions
Large diffs are not rendered by default.

lib/parser.js

Lines changed: 217 additions & 217 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@
3737
"grunt-contrib-clean": "^0.6.0",
3838
"grunt-contrib-connect": "^0.10.1",
3939
"grunt-contrib-copy": "^0.8.0",
40+
"grunt-contrib-uglify": "^0.9.1",
4041
"grunt-contrib-watch": "^0.6.1",
4142
"grunt-shell": "^1.1.2",
43+
"grunt-string-replace": "^1.2.0",
4244
"lodash": "^3.10.0",
4345
"mocha": "^2.2.5",
4446
"pegjs": "git+https://github.com/nwronski/pegjs.git#master",

src/grammar.pegjs

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,34 +1313,39 @@ delete_start "DELETE Keyword"
13131313

13141314
/**
13151315
* @note
1316-
* The inverse rules were created to help the tracer to not traverse
1316+
* The "only" rules were created to help the tracer to not traverse
13171317
* the wrong path.
13181318
*/
13191319
stmt_create "CREATE Statement"
1320-
= ( !create_table_inverse c:( create_table ) ) { return c; }
1321-
/ ( !create_index_inverse c:( create_index ) ) { return c; }
1322-
/ ( !create_trigger_inverse c:( create_trigger ) ) { return c; }
1323-
/ ( !create_view_inverse c:( create_view ) ) { return c; }
1324-
/ ( !create_virtual_inverse c:( create_virtual ) ) { return c; }
1320+
= create_table_only
1321+
/ create_index_only
1322+
/ create_trigger_only
1323+
/ create_view_only
1324+
/ create_virtual_only
13251325

13261326
create_start
13271327
= s:( CREATE ) e
13281328
{ return util.key(s); }
13291329

1330-
create_table_inverse
1331-
= create_start ( INDEX / TRIGGER / VIEW / VIRTUAL )
1330+
create_table_only
1331+
= !( create_start ( INDEX / TRIGGER / VIEW / VIRTUAL ) ) c:( create_table )
1332+
{ return c; }
13321333

1333-
create_index_inverse
1334-
= create_start ( TABLE / TRIGGER / VIEW / VIRTUAL )
1334+
create_index_only
1335+
= !( create_start ( TABLE / TRIGGER / VIEW / VIRTUAL ) ) c:( create_index )
1336+
{ return c; }
13351337

1336-
create_trigger_inverse
1337-
= create_start ( TABLE / INDEX / VIEW / VIRTUAL )
1338+
create_trigger_only
1339+
= !( create_start ( TABLE / INDEX / VIEW / VIRTUAL ) ) c:( create_trigger )
1340+
{ return c; }
13381341

1339-
create_view_inverse
1340-
= create_start ( TABLE / INDEX / TRIGGER / VIRTUAL )
1342+
create_view_only
1343+
= !( create_start ( TABLE / INDEX / TRIGGER / VIRTUAL ) ) c:( create_view )
1344+
{ return c; }
13411345

1342-
create_virtual_inverse
1343-
= create_start ( TABLE / INDEX / TRIGGER / VIEW )
1346+
create_virtual_only
1347+
= !( create_start ( TABLE / INDEX / TRIGGER / VIEW ) ) c:( create_virtual )
1348+
{ return c; }
13441349

13451350
create_table "CREATE TABLE Statement"
13461351
= s:( create_table_start ) ne:( create_core_ine )? id:( id_table ) o

0 commit comments

Comments
 (0)