@hpcc-js/ddl-shim 2.22.0 → 3.0.0

package/package.json

@@ -1,54 +1,48 @@
 {
     "name": "@hpcc-js/ddl-shim",
-    "version": "2.22.0",
+    "version": "3.0.0",
     "description": "hpcc-js DDL parser",
-    "main": "dist/index.js",
-    "module": "dist/index.es6",
-    "unpkg": "dist/index.min.js",
-    "jsdelivr": "dist/index.min.js",
-    "bin": "dist/cli.js",
-    "types": "types/index.d.ts",
-    "typesVersions": {
-        "<3.8": {
-            "*": [
-                "types-3.4/index.d.ts"
-            ]
-        }
+    "type": "module",
+    "exports": {
+        ".": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/index.js"
+        },
+        "./dist/*": "./dist/*"
     },
+    "module": "./dist/index.js",
+    "browser": "./dist/index.js",
+    "types": "./types/index.d.ts",
     "files": [
         "dist/*",
         "src/*",
-        "schema/*.json",
         "types/*"
     ],
     "scripts": {
         "preinstall": "echo \"\" > cli.js",
-        "clean": "rimraf --glob bin lib* types dist ./src/ddl*Schema*.ts ./schema/*.json *.tsbuildinfo",
-        "compile-es6": "tsc --module es6 --outDir ./lib-es6",
-        "compile-es6-watch": "npm run compile-es6 -- -w",
+        "clean": "rimraf --glob bin lib* types dist ./src/ddl*Schema*.ts ./schema/*.json *.tsbuildinfo .turbo",
         "generate-v1": "ts-json-schema-generator --tsconfig tsconfig-schema.json --type DDLSchema > ./schema/v1.json",
         "generate-v2": "ts-json-schema-generator --tsconfig tsconfig-schema.json --type Schema > ./schema/v2.json",
         "generate": "run-p generate-v1 generate-v2",
-        "bundle": "rollup -c",
-        "bundle-watch": "npm run bundle -- --watch",
-        "minimize": "terser dist/index.js -c -m --source-map -o dist/index.min.js",
-        "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
-        "build": "run-s generate compile-es6 bundle",
-        "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
+        "bundle": "node esbuild.js",
+        "bundle-watch": "npm run bundle -- --development --watch",
+        "gen-types": "tsc --project tsconfig.json",
+        "gen-types-watch": "npm run gen-types -- --watch",
+        "build": "npm-run-all --serial generate --parallel gen-types bundle",
         "lint": "eslint ./src",
+        "lint-fix": "eslint --fix src/**/*.ts",
         "docs": "typedoc --options tdoptions.json .",
-        "update": "npx --yes npm-check-updates -u -t minor"
+        "coverage": "vitest run --coverage",
+        "update": "npx --yes npm-check-updates -u -t minor",
+        "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
         "ajv": "6.12.6"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.12.0",
+        "@hpcc-js/esbuild-plugins": "^1.2.0",
         "@rodrigoff/ajv-cli": "5.2.0",
-        "@types/node": "^18",
-        "ts-json-schema-generator": "0.98.0",
-        "tslib": "2.7.0"
+        "ts-json-schema-generator": "0.98.0"
     },
     "repository": {
         "type": "git",
@@ -61,5 +55,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "fbbef050700b0e9d76ef99714856383d95155149"
+    "gitHead": "658c50fd965a7744ba8db675ba6878607c44d5e2"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/ddl-shim";
-export const PKG_VERSION = "2.22.0";
-export const BUILD_VERSION = "2.107.0";
+export const PKG_VERSION = "3.0.0";
+export const BUILD_VERSION = "3.2.0";

package/src/cli.ts

@@ -2,7 +2,7 @@ import * as fs from "fs";
 
 // @ts-ignore
 import * as ddl2Schema from "../schema/v2.json";
-import { upgrade } from "./upgrade";
+import { upgrade } from "./upgrade.ts";
 
 const args = process.argv.slice(2);
 

package/src/dermatology.ts

@@ -1,4 +1,4 @@
-import * as DDL2 from "./ddl/v2";
+import * as DDL2 from "./ddl/v2.ts";
 
 const classMappings: any = {
     c3chart_Bar: "chart_Bar",

package/src/index.ts

@@ -1,8 +1,8 @@
-export * from "./__package__";
-import * as DDL1 from "./ddl/v1";
-import * as DDL2 from "./ddl/v2";
-export * from "./upgrade";
-export * from "./validate";
+export * from "./__package__.ts";
+import * as DDL1 from "./ddl/v1.ts";
+import * as DDL2 from "./ddl/v2.ts";
+export * from "./upgrade.ts";
+export * from "./validate.ts";
 
 export { DDL1, DDL2 };
 

package/src/upgrade.ts

@@ -1,7 +1,7 @@
-import { PKG_NAME, PKG_VERSION } from "./__package__";
-import * as DDL1 from "./ddl/v1";
-import * as DDL2 from "./ddl/v2";
-import { upgrade as dermatologyUpgrade } from "./dermatology";
+import { PKG_NAME, PKG_VERSION } from "./__package__.ts";
+import * as DDL1 from "./ddl/v1.ts";
+import * as DDL2 from "./ddl/v2.ts";
+import { upgrade as dermatologyUpgrade } from "./dermatology.ts";
 
 interface IDatasourceOutput {
     datasource: DDL1.IAnyDatasource;

package/src/validate.ts

@@ -1,6 +1,6 @@
 import * as _Ajv from "ajv";
-import * as DDL from "./ddl/v1";
-import * as DDL2 from "./ddl/v2";
+import * as DDL from "./ddl/v1.ts";
+import * as DDL2 from "./ddl/v2.ts";
 
 const Ajv = (_Ajv as any).default || _Ajv;
 
@@ -31,9 +31,8 @@ export function validate(ddl: DDL.DDLSchema) {
 }
 */
 
-// @ts-ignore
-import * as _ddl2Schema from "../schema/v2.json";
+import _ddl2Schema from "../schema/v2.json" with { type: "json" };
 
 export function validate2(ddl: DDL2.Schema) {
-    return doValidate(ddl, _ddl2Schema);
+    return doValidate(ddl, _ddl2Schema as any);
 }

package/types/__package__.d.ts

@@ -1,4 +1,3 @@
 export declare const PKG_NAME = "@hpcc-js/ddl-shim";
-export declare const PKG_VERSION = "2.22.0";
-export declare const BUILD_VERSION = "2.107.0";
-//# sourceMappingURL=__package__.d.ts.map
+export declare const PKG_VERSION = "3.0.0";
+export declare const BUILD_VERSION = "3.2.0";

package/types/ddl/v1.d.ts

@@ -232,4 +232,3 @@ export declare function isGeohashMapping(mappings: IAnyChoroMapping): boolean;
 export type IAnyMapping = IPieMapping | ILineMapping | IGraphMapping | IAnyChoroMapping | ITableMapping | IHeatMapMapping;
 export type IAnySource = IPieSource | ILineSource | ITableSource | IChoroSource | IGraphSource | IHeatMapSource;
 export type IAnyVisualization = IPieVisualization | ILineVisualization | ITableVisualization | IChoroVisualization | IGraphVisualization | IHeatMapVisualization | ISliderVisualization | IFormVisualization;
-//# sourceMappingURL=v1.d.ts.map

package/types/ddl/v2.d.ts

@@ -336,4 +336,3 @@ export interface Schema {
         };
     };
 }
-//# sourceMappingURL=v2.d.ts.map

package/types/dermatology.d.ts

@@ -1,4 +1,4 @@
-import * as DDL2 from "./ddl/v2";
+import * as DDL2 from "./ddl/v2.ts";
 type CellPosition = {
     id: string;
     position: [number, number, number, number];
@@ -8,4 +8,3 @@ type DDLProperties = {
 };
 export declare function upgrade(ddl2: DDL2.Schema, dermObj: any): DDLProperties;
 export {};
-//# sourceMappingURL=dermatology.d.ts.map

package/types/index.d.ts

@@ -1,8 +1,7 @@
-export * from "./__package__";
-import * as DDL1 from "./ddl/v1";
-import * as DDL2 from "./ddl/v2";
-export * from "./upgrade";
-export * from "./validate";
+export * from "./__package__.ts";
+import * as DDL1 from "./ddl/v1.ts";
+import * as DDL2 from "./ddl/v2.ts";
+export * from "./upgrade.ts";
+export * from "./validate.ts";
 export { DDL1, DDL2 };
 export declare function isDDL2Schema(ref: DDL1.DDLSchema | DDL2.Schema): ref is DDL2.Schema;
-//# sourceMappingURL=index.d.ts.map

package/types/upgrade.d.ts

@@ -1,4 +1,3 @@
-import * as DDL1 from "./ddl/v1";
-import * as DDL2 from "./ddl/v2";
+import * as DDL1 from "./ddl/v1.ts";
+import * as DDL2 from "./ddl/v2.ts";
 export declare function upgrade(ddl: DDL1.IDDL, baseUrl?: string, wuid?: string, toLowerCase?: boolean, dermatologyJson?: {}): DDL2.Schema;
-//# sourceMappingURL=upgrade.d.ts.map

package/types/validate.d.ts

@@ -1,8 +1,7 @@
 import * as _Ajv from "ajv";
-import * as DDL2 from "./ddl/v2";
+import * as DDL2 from "./ddl/v2.ts";
 export declare const ddl2Schema: object;
 export declare function validate2(ddl: DDL2.Schema): {
     success: boolean | PromiseLike<any>;
     errors: _Ajv.ErrorObject[];
 };
-//# sourceMappingURL=validate.d.ts.map