Merge pull request #54 from oracle/2024/2/22

NPX command, error diagnostic fixes, issue 52

Author: mig8447

CHANGELOG.md

@@ -31,7 +31,13 @@ in test/profile.js (test for pk-fk chain of 333 tables, 3 column each; 268 ms fo
 
 ## [1.2.2] - 2024-2-15
 
-Issue #47
+Issue #52
 
 Fixed invalid 'Misaligned Table ...' error, exhibited in vscode QSQL extension (yet to be published).
 
+
+## [1.2.4] - 2024-2-22
+
+NPX command
+
+Error diagnostic fixes

README.md

@@ -48,6 +48,14 @@ The Quick SQL Syntax and Grammar are documented [here](./doc/user/quick-sql-gram
 
 See below for examples of how to use this library.
 
+### Command Line Usage
+
+NPXJS regitry already contains package with conflicting name. To disambiguate, please use command like this:
+
+```
+npx @oracle/quicksql test/apex/department_employees.qsql > output.sql
+```
+
 ### DDL NodeJS ECMA Script Module (ESM) Example
 
 ```js

bin/index.js

@@ -0,0 +1,36 @@
+#! /usr/bin/env node
+import  {quicksql,fromJSON} from "../src/ddl.js";
+
+import fs from "fs";
+  
+try {
+    let file = null;
+
+    let args = process.argv.slice(2);
+    if( args.length < 1 ) {
+      console.error('Please enter input filename (.qsql, or .json)');
+      process.exit(1); 
+    }
+
+    file = args[0];
+    
+    const text = fs.readFileSync(file) 
+    let input = text.toString(); 
+    
+    let output = null;
+    if( file.endsWith('.json') ) {
+        let key = file.substring(0,file.length-'.json'.length);
+        const sp = file.lastIndexOf('/');
+        if( 0 < sp )
+            key = key.substring(sp+1);
+        output = fromJSON(input, key);
+    } else {
+        output = new quicksql(input).getDDL();       
+    }
+    console.log(output);
+    process.exit(0); 
+
+} catch(e) {
+    console.error(e);
+    process.exit(1); 
+};

dist/quick-erd.js

@@ -739,7 +739,7 @@ class de {
     e.rearrangeDiagram(3, !1), this.paperScroller.centerContent();
   }
 }
-const ue = "1.2.2", fe = {
+const ue = "1.2.6", fe = {
   Diagram: de,
   version: ue
 };

dist/quick-erd.umd.cjs

@@ -1,6 +1,6 @@
 {
   "name": "@oracle/quicksql",
-  "version": "1.2.2",
+  "version": "1.2.6",
   "description": "Quick SQL to DDL and ERD translator",
   "main": "./dist/quick-sql.umd.cjs",
   "module": "./dist/quick-sql.js",
@@ -18,6 +18,9 @@
   "engines": {
     "node": ">=16"
   },
+  "bin": {
+    "quicksql": "bin/index.js"
+  },
   "config": {
     "ddlLibraryName": "quickSQL",
     "ddlLibraryFileName": "quick-sql",

dist/quick-sql.js

@@ -36,7 +36,7 @@ export const quicksql = (function () {
         overridesettings: {label: 'Ignore toDDL() second parameter', value:'no',check:['yes','no']},    
         prefix: {label: 'Object Prefix', value:'' },
         //ondelete: {label: 'On Delete', value:'Cascade',check:['restrict','cascade','set null']},
-        pk: { label: 'Primary Key Maintenance', value: identityDataType, check: [identityDataType, guid,'SEQ', 'NONE']},
+        pk: { label: 'Primary Key Maintenance', value: guid, check: [identityDataType, guid,'SEQ', 'NONE']},
         prefixpkwithtname: {label:'Prefix primary keys with table name', value:'no',check:['yes','no']}, 
         rowkey: {label: 'Alphanumeric Row Identifier', value:'no',check:['yes','no']},
         rowversion: {label: 'Row Version Number', value:'no',check:['yes','no']},
@@ -74,6 +74,7 @@ export const quicksql = (function () {
         this.errors = null;
         this.options = JSON.parse(JSON.stringify(defaultOptions));
         this.input = fullInput;
+        this.postponedAlters = []; 
 
         this.getOptionValue = function( kEy ) {
             const key = kEy.toLowerCase(); 
@@ -226,7 +227,7 @@ export const quicksql = (function () {
             if( this.getOptionValue('prefix') != null )
                 value = this.getOptionValue('prefix');
             ret = ret + value;
-            if( value != '' )
+            if( value != '' && !value.endsWith('_') )
                 ret = ret + '_';
             return ret.toLowerCase();
         };
@@ -369,6 +370,10 @@ export const quicksql = (function () {
                 output += this.forest[i].toDDL()+'\n';
             }
 
+            for ( let i = 0; i < this.postponedAlters.length; i++ ) {
+                output += this.postponedAlters[i]+'\n';
+            }
+
             let j = 0;
             for( let i = 0; i < descendants.length; i++ ) {
                 let trigger = descendants[i].generateTrigger();

dist/quick-sql.umd.cjs

@@ -59,23 +59,14 @@ const findErrors = (function () {
     function ref_error_in_view( ddl, node ) {
         var ret  = [];
 
-        var line = node.content.toLowerCase();
         if( node.parseType() == 'view' ) {
-            var chunks = split_str(line,' '); //line.split(' ');
-            let pos = 0;
-            for( var j = 0; j < chunks.length; j++ ) { 
-                pos += chunks[j].length;
-                if( chunks[j] == ' ' ) 
-                    continue;
-                if( chunks[j] == 'view' ) 
-                    continue;
-                if( j == 1 ) 
-                    continue;
-               var tbl = ddl.find(chunks[j]);
+            var chunks = node.src;
+            for( var j = 2; j < chunks.length; j++ ) { 
+                var tbl = ddl.find(chunks[j].value);
                 if( tbl == null ) {
                     ret.push( new SyntaxError(
-                        messages.undefinedObject+chunks[j],
-                        new Offset(node.line, pos-chunks[j].length)
+                        messages.undefinedObject+chunks[j].value,
+                        new Offset(node.line, chunks[j].begin)
                     ));
                 }
             }
@@ -85,32 +76,23 @@ const findErrors = (function () {
 
     function fk_ref_error( ddl, node ) {
         var ret  = [];
-        var line = node.content.toLowerCase();
-        if( 0 < line.indexOf("/fk") || 0 < line.indexOf("/reference") ) {
-            let chunks = split_str(line,' '); //line.split(' ');
-            let pos = 0;
-            let refIsNext = false;
-            for( var j = 0; j < chunks.length; j++ ) { 
-                pos += chunks[j].length;
-                if( chunks[j] == ' ' )
-                    continue;
-                if( chunks[j] == "/fk" || 0 == chunks[j].indexOf("/reference") ) {
-                    refIsNext = true;
-                    continue;
-                }
-                if( !refIsNext )
-                    continue;
-                var tbl = ddl.find(chunks[j]);
-                if(  tbl == null ) {
-                    ret.push( new SyntaxError(
-                        messages.undefinedObject+chunks[j],
-                        new Offset(node.line, pos-chunks[j].length)
-                    ));                   
-                    break;
-                }
+        if( node.isOption("fk") || 0 < node.indexOf('reference', true) ) {
+            let fk = null;
+            let pos = node.indexOf('fk');
+            if( pos < 0 )
+                pos = node.indexOf('reference');
+            pos++;
+            if( node.src.length-1 < pos )
+                return ret;
+            var tbl = ddl.find(node.src[pos].value);
+            if(  tbl == null ) {
+                ret.push( new SyntaxError(
+                    messages.undefinedObject+node.src[pos].value,
+                    new Offset(node.line, node.src[pos].begin)
+                ));                   
             }
         }
-    return ret;
+        return ret;
     }
 
     function line_mismatch( lines ) {