sqljson-query - npm Package Compare versions

Comparing version 1.10.1 to 1.11.0

lib/lib.d.ts

 import { Nullable } from './util/nullable';
 import { QueryGroupSpec, QuerySpec, ResultRepr } from './query-specs';
-import { ResultTypeSpec, ResultTypesSource } from './result-type-generation';
-import { SqlSpec } from './sql-generation/sql-specs';
-import { QueryPropertiesMetadata } from './query-properties-metadata-generation';
+import { ResultTypeSpec, ResultTypesSource } from './result-type-gen';
+import { SqlSpec } from './sql-gen/sql-specs';
+import { QueryPropertiesMetadata } from './query-props-md-gen';
 import { DatabaseMetadata } from './dbmd/database-metadata';
@@ -10,3 +10,3 @@ import { SourceGenerationOptions, SourceLanguage } from './source-generation-options';
 export * from './query-specs';
-export * from './result-type-generation';
+export * from './result-type-gen';
 export * from './dbmd/database-metadata';
@@ -13,0 +13,0 @@ export interface QuerySources {

lib/lib.js

@@ -21,10 +21,10 @@ "use strict";
 const query_specs_1 = require("./query-specs");
-const result_type_generation_1 = require("./result-type-generation");
-const sql_source_generator_1 = require("./sql-generation/sql-source-generator");
-const sql_spec_generator_1 = require("./sql-generation/sql-spec-generator");
-const sql_generation_1 = require("./sql-generation");
-const query_properties_metadata_generation_1 = require("./query-properties-metadata-generation");
+const result_type_gen_1 = require("./result-type-gen");
+const sql_source_generator_1 = require("./sql-gen/sql-source-generator");
+const sql_spec_generator_1 = require("./sql-gen/sql-spec-generator");
+const sql_gen_1 = require("./sql-gen");
+const query_props_md_gen_1 = require("./query-props-md-gen");
 __exportStar(require("./source-generation-options"), exports);
 __exportStar(require("./query-specs"), exports);
-__exportStar(require("./result-type-generation"), exports);
+__exportStar(require("./result-type-gen"), exports);
 __exportStar(require("./dbmd/database-metadata"), exports);
@@ -37,3 +37,3 @@ function generateQueryGroupSources(queryGroupSpec, dbmd, opts) {
     const sqlSpecGen = new sql_spec_generator_1.SqlSpecGenerator(dbmd, defaultSchema, propNameFn);
-    const sqlSrcGen = new sql_source_generator_1.SqlSourceGenerator((0, sql_generation_1.getSqlDialect)(dbmd, 2), dbmd.caseSensitivity, unqualNameSchemas);
+    const sqlSrcGen = new sql_source_generator_1.SqlSourceGenerator((0, sql_gen_1.getSqlDialect)(dbmd, 2), dbmd.caseSensitivity, unqualNameSchemas);
     return queryGroupSpec.querySpecs.map(query => {
@@ -55,3 +55,3 @@ var _a;
                 makeResultTypes(firstSqlSpec, query.queryName, query.typesFileHeader, sqlResourceNames, paramNames, opts),
-            queryPropertiesMetadata: (0, query_properties_metadata_generation_1.makeQueryPropertiesMetadata)(query.queryName, firstSqlSpec),
+            queryPropertiesMetadata: (0, query_props_md_gen_1.makeQueryPropertiesMetadata)(query.queryName, firstSqlSpec),
         };
@@ -68,8 +68,8 @@ });
 function makeResultTypes(sqlSpec, queryName, queryTypesFileHeader, sqlResourceNames, params, opts) {
-    const resultTypeSpecs = (0, result_type_generation_1.makeNamedResultTypeSpecs)(sqlSpec);
+    const resultTypeSpecs = (0, result_type_gen_1.makeNamedResultTypeSpecs)(sqlSpec);
     return {
         specs: resultTypeSpecs,
-        sourceCodeByLanguage: (0, collections_1.makeMap)(opts.resultTypeLanguages, srcLang => srcLang, srcLang => (0, result_type_generation_1.makeResultTypesSource)(resultTypeSpecs, srcLang, queryName, queryTypesFileHeader, sqlResourceNames, params, opts))
+        sourceCodeByLanguage: (0, collections_1.makeMap)(opts.resultTypeLanguages, srcLang => srcLang, srcLang => (0, result_type_gen_1.makeResultTypesSource)(resultTypeSpecs, srcLang, queryName, queryTypesFileHeader, sqlResourceNames, params, opts))
     };
 }
 //# sourceMappingURL=lib.js.map

lib/mod.d.ts

 import { Nullable } from './util/mod';
 import { QueryGroupSpec } from './query-specs';
 export * from './lib';
+export * from './dbmd/gen/gen-dbmd-lib';
+export * from './dbmd/gen/gen-relsmd-lib';
 export * from './dbmd/relations-md-source-generator';
@@ -17,3 +19,3 @@ export interface QueryGenerationOptions {
 }
-export declare function generateQueriesWithArgvOptions(queryGroupSpec: QueryGroupSpec, args: string[]): Promise<Error | undefined>;
+export declare function generateQueriesWithArgvOptions(queryGroupSpec: QueryGroupSpec, args: string[]): Promise<void>;
 export declare function generateQueries(queryGroupSpec: QueryGroupSpec, opts: QueryGenerationOptions): Promise<void>;

lib/mod.js

@@ -38,10 +38,12 @@ "use strict";
 __exportStar(require("./lib"), exports);
+__exportStar(require("./dbmd/gen/gen-dbmd-lib"), exports);
+__exportStar(require("./dbmd/gen/gen-relsmd-lib"), exports);
 __exportStar(require("./dbmd/relations-md-source-generator"), exports);
 async function generateQueriesWithArgvOptions(queryGroupSpec, args) {
     var _a, _b;
-    const requiredOptions = [
+    const requiredNamedArgs = [
         'dbmd',
         'sqlDir'
     ];
-    const optionalOptions = [
+    const optionalNamedArgs = [
         'sqlSpecDir',
@@ -52,3 +54,3 @@ 'propsMdDir',
     ];
-    const parsedArgs = (0, args_1.parseArgs)(args, requiredOptions, optionalOptions, 0);
+    const parsedArgs = (0, args_1.parseArgs)(args, requiredNamedArgs, optionalNamedArgs, 0);
     if (typeof parsedArgs === 'string') // arg parsing error
@@ -79,3 +81,3 @@ throw new Error(parsedArgs);
         if (e instanceof query_specs_1.SpecError)
-            return new Error("Error in query specification.\n" +
+            throw new Error("Error in query specification.\n" +
                 "-----------------------------\n" +
@@ -82,0 +84,0 @@ "In query: " + e.specLocation.queryName + "\n" +

lib/source-generation-options.d.ts

@@ -1,2 +0,2 @@
-import { ResultTypeSpec, TableFieldResultTypeProperty } from './result-type-generation';
+import { ResultTypeSpec, TableFieldResultTypeProperty } from './result-type-gen';
 import { Nullable } from './util/mod';
@@ -3,0 +3,0 @@ export type SourceLanguage = 'TS' | 'Java';

package.json

 {
   "name": "sqljson-query",
-  "version": "1.10.1",
+  "version": "1.11.0",
   "description": "Command line tool to generate SQL/JSON SQL queries and result types for Typescript or Java.",
@@ -5,0 +5,0 @@ "keywords": [

src/lib.ts

@@ -9,8 +9,8 @@ import { propertyNameDefaultFunction } from './util/property-names';
   makeNamedResultTypeSpecs, makeResultTypesSource, ResultTypeSpec, ResultTypesSource
-} from './result-type-generation';
-import { SqlSourceGenerator } from './sql-generation/sql-source-generator';
-import { SqlSpecGenerator } from './sql-generation/sql-spec-generator';
-import { SqlSpec } from './sql-generation/sql-specs';
-import { getSqlDialect } from './sql-generation';
-import { QueryPropertiesMetadata, makeQueryPropertiesMetadata } from './query-properties-metadata-generation';
+} from './result-type-gen';
+import { SqlSourceGenerator } from './sql-gen/sql-source-generator';
+import { SqlSpecGenerator } from './sql-gen/sql-spec-generator';
+import { SqlSpec } from './sql-gen/sql-specs';
+import { getSqlDialect } from './sql-gen';
+import { QueryPropertiesMetadata, makeQueryPropertiesMetadata } from './query-props-md-gen';
 import { DatabaseMetadata } from './dbmd/database-metadata';
@@ -21,3 +21,3 @@ import { SourceGenerationOptions, SourceLanguage } from './source-generation-options';
 export * from './query-specs';
-export * from './result-type-generation';
+export * from './result-type-gen';
 export * from './dbmd/database-metadata';
@@ -24,0 +24,0 @@

src/mod.ts

@@ -8,12 +8,8 @@ import * as path from 'path';
 import {SourceGenerationOptions, SourceLanguage} from './source-generation-options';
-import {QueryPropertiesMetadata} from './query-properties-metadata-generation';
-import {
-  DatabaseMetadata,
-  GeneratedResultTypes,
-  GeneratedSql,
-  generateQueryGroupSources,
-  parseStoredDatabaseMetadata
-} from './lib';
+import {QueryPropertiesMetadata} from './query-props-md-gen';
+import {DatabaseMetadata, GeneratedResultTypes, GeneratedSql, generateQueryGroupSources, parseStoredDatabaseMetadata} from './lib';
 
 export * from './lib';
+export * from './dbmd/gen/gen-dbmd-lib';
+export * from './dbmd/gen/gen-relsmd-lib';
 export * from './dbmd/relations-md-source-generator';
@@ -41,7 +37,7 @@
 {
-  const requiredOptions = [
+  const requiredNamedArgs = [
     'dbmd', // database metadata json file path
     'sqlDir'
   ];
-  const optionalOptions = [
+  const optionalNamedArgs = [
     'sqlSpecDir',
@@ -53,3 +49,3 @@ 'propsMdDir',
 
-  const parsedArgs = parseArgs(args, requiredOptions, optionalOptions, 0);
+  const parsedArgs = parseArgs(args, requiredNamedArgs, optionalNamedArgs, 0);
   if ( typeof parsedArgs === 'string' ) // arg parsing error
@@ -87,3 +83,3 @@ throw new Error(parsedArgs);
     if (e instanceof SpecError)
-      return new Error(
+      throw new Error(
         "Error in query specification.\n" +
@@ -289,2 +285,2 @@ "-----------------------------\n" +
     : null;
-}
+}

src/source-generation-options.ts

@@ -1,2 +0,2 @@
-import { ResultTypeSpec, TableFieldResultTypeProperty } from './result-type-generation';
+import { ResultTypeSpec, TableFieldResultTypeProperty } from './result-type-gen';
 import { Nullable } from './util/mod';
@@ -3,0 +3,0 @@

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

574603

decreased by-8.93%

Number of package files

192

decreased by-9.43%

Lines of code

11748

decreased by-2.03%

Number of medium supply chain risk alerts

2

increased by100%

No dependency changes