@digicatapult/dtdl-parser 0.2.30 → 1.0.0

package/build/error.d.ts

@@ -1,2 +1,4 @@
+import type { ModelingException } from '../types/DtdlErr.d.ts';
 export declare const isResolutionException: (err: unknown) => boolean;
-export declare const errorHandler: (err: unknown) => void;
+export declare const isModelingException: (input: unknown) => input is ModelingException;
+export declare const errorHandler: (err: unknown) => ModelingException;

package/build/error.js

@@ -1,9 +1,15 @@
-let { error: e } = console, n = (e)=>'Parsing' === e.ExceptionKind, o = (e)=>'Resolution' === e.ExceptionKind;
-export const isResolutionException = (e)=>e instanceof Error && o(JSON.parse(e.message));
-export const errorHandler = (r)=>{
-    if (!(r instanceof Error)) return e(`Unexpected error: ${r}`);
-    let t = JSON.parse(r.message);
-    n(t) || o(t) || e('Unknown exception type'), e(t);
+let { error: o } = console, r = (o)=>'Parsing' === o.ExceptionKind, e = (o)=>'Resolution' === o.ExceptionKind;
+export const isResolutionException = (o)=>o instanceof Error && e(JSON.parse(o.message));
+export const isModelingException = (o)=>'object' == typeof o && null !== o && 'ExceptionKind' in o && (r(o) || e(o));
+export const errorHandler = (n)=>{
+    if (!(n instanceof Error)) throw o('Non-Error thrown:', n), n;
+    try {
+        let o = JSON.parse(n.message);
+        if (r(o) || e(o)) return o;
+    } catch (r) {
+        o('Failed to parse error message:', r);
+    }
+    throw o('Unknown error from parser:', n), n;
 };
 
 //# sourceMappingURL=error.js.map

package/build/error.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/error.ts"],"sourcesContent":["import type { ModelingException, ParsingException, ResolutionException } from '../types/DtdlErr.d.ts'\n\nconst { error } = console\n\nconst isParsingEx = (exception: ModelingException): exception is ParsingException => {\n  return exception.ExceptionKind === 'Parsing'\n}\n\nconst isResolutionEx = (exception: ModelingException): exception is ResolutionException => {\n  return exception.ExceptionKind === 'Resolution'\n}\n\nexport const isResolutionException = (err: unknown) => {\n  if (!(err instanceof Error)) return false\n  return isResolutionEx(JSON.parse(err.message))\n}\n\nexport const errorHandler = (err: unknown) => {\n  if (!(err instanceof Error)) return error(`Unexpected error: ${err}`)\n\n  const exception = JSON.parse(err.message) as ModelingException\n\n  if (!(isParsingEx(exception) || isResolutionEx(exception))) error('Unknown exception type')\n  error(exception)\n}\n"],"names":["error","console","isParsingEx","exception","ExceptionKind","isResolutionEx","isResolutionException","err","Error","JSON","parse","message","errorHandler"],"mappings":"AAEA,IAAM,EAAEA,OAAAA,CAAK,EAAE,GAAGC,SAEZC,IAAc,CAACC,IACZA,AAA4B,cAA5BA,EAAUC,aAAa,EAG1BC,IAAiB,CAACF,IACfA,AAA4B,iBAA5BA,EAAUC,aAAa;AAGhC,OAAO,MAAME,wBAAwB,CAACC,IACpC,AAAMA,aAAeC,SACdH,EAAeI,KAAKC,KAAK,CAACH,EAAII,OAAO,GAC7C;AAED,OAAO,MAAMC,eAAe,CAACL;IAC3B,IAAI,CAAEA,CAAAA,aAAeC,KAAI,GAAI,OAAOR,EAAM,CAAC,kBAAkB,EAAEO,GAAK;IAEpE,IAAMJ,IAAYM,KAAKC,KAAK,CAACH,EAAII,OAAO;IAElCT,EAAYC,MAAcE,EAAeF,MAAaH,EAAM,2BAClEA,EAAMG;AACR,EAAC"}
+{"version":3,"sources":["../src/error.ts"],"sourcesContent":["import type { ModelingException, ParsingException, ResolutionException } from '../types/DtdlErr.d.ts'\n\nconst { error } = console\n\nconst isParsingEx = (exception: ModelingException): exception is ParsingException => {\n  return exception.ExceptionKind === 'Parsing'\n}\n\nconst isResolutionEx = (exception: ModelingException): exception is ResolutionException => {\n  return exception.ExceptionKind === 'Resolution'\n}\n\nexport const isResolutionException = (err: unknown) => {\n  if (!(err instanceof Error)) return false\n  return isResolutionEx(JSON.parse(err.message))\n}\n\nexport const isModelingException = (input: unknown): input is ModelingException => {\n  if (typeof input === 'object' && input !== null && 'ExceptionKind' in input) {\n    const exception = input as ModelingException\n    return isParsingEx(exception) || isResolutionEx(exception)\n  }\n  return false\n}\n\nexport const errorHandler = (err: unknown): ModelingException => {\n  if (!(err instanceof Error)) {\n    error('Non-Error thrown:', err)\n    throw err\n  }\n  try {\n    const exception = JSON.parse(err.message) as ModelingException\n    if (isParsingEx(exception) || isResolutionEx(exception)) {\n      return exception\n    }\n  } catch (parseErr) {\n    error('Failed to parse error message:', parseErr)\n  }\n  error('Unknown error from parser:', err)\n  throw err\n}\n"],"names":["error","console","isParsingEx","exception","ExceptionKind","isResolutionEx","isResolutionException","err","Error","JSON","parse","message","isModelingException","input","errorHandler","parseErr"],"mappings":"AAEA,IAAM,EAAEA,OAAAA,CAAK,EAAE,GAAGC,SAEZC,IAAc,CAACC,IACZA,AAA4B,cAA5BA,EAAUC,aAAa,EAG1BC,IAAiB,CAACF,IACfA,AAA4B,iBAA5BA,EAAUC,aAAa;AAGhC,OAAO,MAAME,wBAAwB,CAACC,IACpC,AAAMA,aAAeC,SACdH,EAAeI,KAAKC,KAAK,CAACH,EAAII,OAAO,GAC7C;AAED,OAAO,MAAMC,sBAAsB,CAACC,IAClC,AAAqB,YAAjB,OAAOA,KAAsBA,AAAU,SAAVA,KAAkB,mBAAmBA,KAE7DX,CAAAA,EADWW,MACeR,EADfQ,EACuC,EAG5D;AAED,OAAO,MAAMC,eAAe,CAACP;IAC3B,IAAI,CAAEA,CAAAA,aAAeC,KAAI,GAEvB,MADAR,EAAM,qBAAqBO,IACrBA;IAER,IAAI;QACF,IAAMJ,IAAYM,KAAKC,KAAK,CAACH,EAAII,OAAO;QACxC,IAAIT,EAAYC,MAAcE,EAAeF,IAC3C,OAAOA;IAEX,EAAE,OAAOY,GAAU;QACjBf,EAAM,kCAAkCe;IAC1C;IAEA,MADAf,EAAM,8BAA8BO,IAC9BA;AACR,EAAC"}

package/build/index.d.ts

@@ -1,9 +1,10 @@
+import type { ModelingException } from '../types/DtdlErr.d.ts';
 import type { DtdlObjectModel } from '../types/DtdlOm.d.ts';
 import type { Parser } from './interop.js';
 export type * from '../types/DtdlErr.d.ts';
 export type * from '../types/DtdlOm.d.ts';
 export { getInterop } from './interop.js';
 export declare const searchForJsonFiles: (directory: string) => string[];
-export declare const parseDtdl: (json: string, parserModule: Parser) => DtdlObjectModel | null;
+export declare const parseDtdl: (json: string, parserModule: Parser) => DtdlObjectModel | ModelingException;
 export declare const validateDirectories: (directory: string, parser: Parser, incResolutionException: boolean) => boolean;
 export declare const parseDirectories: (directory: string, parser: Parser) => DtdlObjectModel | null;

package/build/index.js

@@ -1,60 +1,60 @@
-import e from 'fs';
-import r from 'path';
-import { errorHandler as t, isResolutionException as l } from './error.js';
-let { log: n, error: s } = console;
+import r from 'fs';
+import e from 'path';
+import { errorHandler as t, isModelingException as l, isResolutionException as n } from './error.js';
+let { log: s, error: i } = console;
 export { getInterop } from './interop.js';
-export const searchForJsonFiles = (t)=>e.existsSync(t) ? e.readdirSync(t).map((e)=>r.join(t, e)).reduce((t, l)=>e.statSync(l).isDirectory() ? t.concat(searchForJsonFiles(l)) : '.json' === r.extname(l) ? t.concat(l) : t, []) : (s(`'${t}' not a valid filepath`), []);
-let i = (r)=>{
+export const searchForJsonFiles = (t)=>r.existsSync(t) ? r.readdirSync(t).map((r)=>e.join(t, r)).reduce((t, l)=>r.statSync(l).isDirectory() ? t.concat(searchForJsonFiles(l)) : '.json' === e.extname(l) ? t.concat(l) : t, []) : (i(`'${t}' not a valid filepath`), []);
+let a = (e)=>{
     try {
-        let t = e.readFileSync(r, 'utf-8');
+        let t = r.readFileSync(e, 'utf-8');
         return JSON.parse(t);
-    } catch (e) {
-        return s(`Invalid JSON at '${r}'`), s(e), null;
+    } catch (r) {
+        return i(`Invalid JSON at '${e}'`), i(r), null;
     }
-}, a = (e)=>{
-    let r = [];
-    for (let t of e){
-        let e = i(t);
-        if (null === e) return null;
-        r.push(e);
+}, o = (r)=>{
+    let e = [];
+    for (let t of r){
+        let r = a(t);
+        if (null === r) return null;
+        e.push(r);
     }
-    return r;
-}, o = (r, i, a)=>{
+    return e;
+}, c = (e, l, a)=>{
     try {
-        let t = e.readFileSync(r, 'utf-8');
-        return i.parse(t), n(`Successfully validated '${r}'`), !0;
-    } catch (e) {
-        if (!a && l(e)) return n(`Successfully validated '${r}'`), !0;
-        return s(`Error parsing '${r}'`), t(e), !1;
+        let t = r.readFileSync(e, 'utf-8');
+        return l.parse(t), s(`Successfully validated '${e}'`), !0;
+    } catch (r) {
+        if (!a && n(r)) return s(`Successfully validated '${e}'`), !0;
+        return i(`Error parsing '${e}'`), t(r), !1;
     }
 };
-export const parseDtdl = (e, r)=>{
+export const parseDtdl = (r, e)=>{
     try {
-        let t = JSON.parse(r.parse(e));
-        return n("Successfully parsed"), t;
-    } catch (e) {
-        return s("Error parsing"), t(e), null;
+        let t = JSON.parse(e.parse(r));
+        return s("Successfully parsed"), t;
+    } catch (r) {
+        return i("Error parsing"), t(r);
     }
 };
-export const validateDirectories = (e, r, t)=>{
-    n(`${r.parserVersion()}\n`), n(`Validating DTDL at: '${e}'`);
-    let l = searchForJsonFiles(e);
+export const validateDirectories = (r, e, t)=>{
+    s(`${e.parserVersion()}\n`), s(`Validating DTDL at: '${r}'`);
+    let l = searchForJsonFiles(r);
     if (l.length < 1) return !1;
-    for (let e of (n(`Found ${l.length} files:`), n(l), l))if (!o(e, r, t)) return !1;
-    return n(`All files validated!\n`), !0;
+    for (let r of (s(`Found ${l.length} files:`), s(l), l))if (!c(r, e, t)) return !1;
+    return s(`All files validated!\n`), !0;
 };
-export const parseDirectories = (e, r)=>{
-    n(`${r.parserVersion()}\n`), n(`Parsing DTDL at: '${e}'`);
-    let t = searchForJsonFiles(e);
+export const parseDirectories = (r, e)=>{
+    s(`${e.parserVersion()}\n`), s(`Parsing DTDL at: '${r}'`);
+    let t = searchForJsonFiles(r);
     if (t.length < 1) return null;
-    n(`Found ${t.length} files:`), n(t);
-    let l = a(t);
-    if (null === l) return null;
-    let s = parseDtdl(JSON.stringify(l), r);
-    if (null === s) return null;
-    n(`All files parsed!\n`), n("Entities:"), n(Object.keys(s));
-    let i = Object.values(s).filter((e)=>'Interface' === e.EntityKind);
-    return n(`Number of interfaces: ${i.length}`), s;
+    s(`Found ${t.length} files:`), s(t);
+    let n = o(t);
+    if (null === n) return null;
+    let i = parseDtdl(JSON.stringify(n), e);
+    if (l(i)) return s('Error while parsing directories:'), s(i), null;
+    s(`All files parsed!\n`), s("Entities:"), s(Object.keys(i));
+    let a = Object.values(i).filter((r)=>'Interface' === r.EntityKind);
+    return s(`Number of interfaces: ${a.length}`), i;
 };
 
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import fs from 'fs'\nimport path from 'path'\nimport type { DtdlObjectModel, InterfaceInfo } from '../types/DtdlOm.d.ts'\nimport { errorHandler, isResolutionException } from './error.js'\nimport type { Parser } from './interop.js'\n\nconst { log, error } = console\n\nexport type * from '../types/DtdlErr.d.ts'\nexport type * from '../types/DtdlOm.d.ts'\nexport { getInterop } from './interop.js'\n\nexport const searchForJsonFiles = (directory: string): string[] => {\n  if (!fs.existsSync(directory)) {\n    error(`'${directory}' not a valid filepath`)\n    return []\n  }\n\n  return fs\n    .readdirSync(directory)\n    .map((file) => path.join(directory, file))\n    .reduce((jsonFiles, fullPath) => {\n      if (fs.statSync(fullPath).isDirectory()) {\n        return jsonFiles.concat(searchForJsonFiles(fullPath)) //recursive\n      } else if (path.extname(fullPath) === '.json') {\n        return jsonFiles.concat(fullPath)\n      }\n      return jsonFiles\n    }, [] as string[])\n}\n\nconst readJsonFile = (filepath: string): unknown | null => {\n  try {\n    const file = fs.readFileSync(filepath, 'utf-8')\n    const json = JSON.parse(file)\n    return json\n  } catch (err) {\n    error(`Invalid JSON at '${filepath}'`)\n    error(err)\n    return null\n  }\n}\n\nconst combineJson = (filepaths: string[]) => {\n  const combinedJson: unknown[] = []\n\n  for (const filepath of filepaths) {\n    const json = readJsonFile(filepath)\n    if (json === null) {\n      return null // exit on any error\n    }\n    combinedJson.push(json)\n  }\n\n  return combinedJson\n}\n\nconst validateFile = (filepath: string, parserModule: Parser, incResolutionException: boolean): boolean => {\n  try {\n    const file = fs.readFileSync(filepath, 'utf-8')\n    parserModule.parse(file)\n    log(`Successfully validated '${filepath}'`)\n    return true\n  } catch (err) {\n    if (!incResolutionException && isResolutionException(err)) {\n      // ignore resolution exception\n      log(`Successfully validated '${filepath}'`)\n      return true\n    }\n    error(`Error parsing '${filepath}'`)\n    errorHandler(err)\n    return false\n  }\n}\n\nexport const parseDtdl = (json: string, parserModule: Parser): DtdlObjectModel | null => {\n  try {\n    const model = JSON.parse(parserModule.parse(json)) as DtdlObjectModel\n    log(`Successfully parsed`)\n    return model\n  } catch (err) {\n    error(`Error parsing`)\n    errorHandler(err)\n    return null\n  }\n}\n\nexport const validateDirectories = (directory: string, parser: Parser, incResolutionException: boolean): boolean => {\n  log(`${parser.parserVersion()}\\n`)\n  log(`Validating DTDL at: '${directory}'`)\n\n  const filepaths = searchForJsonFiles(directory)\n  if (filepaths.length < 1) return false\n\n  log(`Found ${filepaths.length} files:`)\n  log(filepaths)\n\n  for (const filepath of filepaths) {\n    const isValid = validateFile(filepath, parser, incResolutionException)\n    if (!isValid) return false // stop validating if error\n  }\n\n  log(`All files validated!\\n`)\n  return true\n}\n\nexport const parseDirectories = (directory: string, parser: Parser): DtdlObjectModel | null => {\n  log(`${parser.parserVersion()}\\n`)\n  log(`Parsing DTDL at: '${directory}'`)\n\n  const filepaths = searchForJsonFiles(directory)\n  if (filepaths.length < 1) return null\n\n  log(`Found ${filepaths.length} files:`)\n  log(filepaths)\n\n  const fullJson = combineJson(filepaths)\n  if (fullJson === null) return null\n\n  const fullModel = parseDtdl(JSON.stringify(fullJson), parser)\n  if (fullModel === null) return null\n\n  log(`All files parsed!\\n`)\n  log(`Entities:`)\n  log(Object.keys(fullModel))\n\n  // Example type guard\n  const interfaces: InterfaceInfo[] = Object.values(fullModel).filter(\n    (value): value is InterfaceInfo => value.EntityKind === 'Interface'\n  )\n  log(`Number of interfaces: ${interfaces.length}`)\n\n  return fullModel\n}\n"],"names":["fs","path","errorHandler","isResolutionException","log","error","console","getInterop","searchForJsonFiles","directory","existsSync","readdirSync","map","file","join","reduce","jsonFiles","fullPath","statSync","isDirectory","concat","extname","readJsonFile","filepath","readFileSync","JSON","parse","err","combineJson","filepaths","combinedJson","json","push","validateFile","parserModule","incResolutionException","parseDtdl","model","validateDirectories","parser","parserVersion","length","parseDirectories","fullJson","fullModel","stringify","Object","keys","interfaces","values","filter","value","EntityKind"],"mappings":"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"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import fs from 'fs'\nimport path from 'path'\nimport type { ModelingException } from '../types/DtdlErr.d.ts'\nimport type { DtdlObjectModel, InterfaceInfo } from '../types/DtdlOm.d.ts'\nimport { errorHandler, isModelingException, isResolutionException } from './error.js'\nimport type { Parser } from './interop.js'\n\nconst { log, error } = console\n\nexport type * from '../types/DtdlErr.d.ts'\nexport type * from '../types/DtdlOm.d.ts'\nexport { getInterop } from './interop.js'\n\nexport const searchForJsonFiles = (directory: string): string[] => {\n  if (!fs.existsSync(directory)) {\n    error(`'${directory}' not a valid filepath`)\n    return []\n  }\n\n  return fs\n    .readdirSync(directory)\n    .map((file) => path.join(directory, file))\n    .reduce((jsonFiles, fullPath) => {\n      if (fs.statSync(fullPath).isDirectory()) {\n        return jsonFiles.concat(searchForJsonFiles(fullPath)) //recursive\n      } else if (path.extname(fullPath) === '.json') {\n        return jsonFiles.concat(fullPath)\n      }\n      return jsonFiles\n    }, [] as string[])\n}\n\nconst readJsonFile = (filepath: string): unknown | null => {\n  try {\n    const file = fs.readFileSync(filepath, 'utf-8')\n    const json = JSON.parse(file)\n    return json\n  } catch (err) {\n    error(`Invalid JSON at '${filepath}'`)\n    error(err)\n    return null\n  }\n}\n\nconst combineJson = (filepaths: string[]) => {\n  const combinedJson: unknown[] = []\n\n  for (const filepath of filepaths) {\n    const json = readJsonFile(filepath)\n    if (json === null) {\n      return null // exit on any error\n    }\n    combinedJson.push(json)\n  }\n\n  return combinedJson\n}\n\nconst validateFile = (filepath: string, parserModule: Parser, incResolutionException: boolean): boolean => {\n  try {\n    const file = fs.readFileSync(filepath, 'utf-8')\n    parserModule.parse(file)\n    log(`Successfully validated '${filepath}'`)\n    return true\n  } catch (err) {\n    if (!incResolutionException && isResolutionException(err)) {\n      // ignore resolution exception\n      log(`Successfully validated '${filepath}'`)\n      return true\n    }\n    error(`Error parsing '${filepath}'`)\n    errorHandler(err)\n    return false\n  }\n}\n\nexport const parseDtdl = (json: string, parserModule: Parser): DtdlObjectModel | ModelingException => {\n  try {\n    const model = JSON.parse(parserModule.parse(json)) as DtdlObjectModel\n    log(`Successfully parsed`)\n    return model\n  } catch (err) {\n    error(`Error parsing`)\n    return errorHandler(err)\n  }\n}\n\nexport const validateDirectories = (directory: string, parser: Parser, incResolutionException: boolean): boolean => {\n  log(`${parser.parserVersion()}\\n`)\n  log(`Validating DTDL at: '${directory}'`)\n\n  const filepaths = searchForJsonFiles(directory)\n  if (filepaths.length < 1) return false\n\n  log(`Found ${filepaths.length} files:`)\n  log(filepaths)\n\n  for (const filepath of filepaths) {\n    const isValid = validateFile(filepath, parser, incResolutionException)\n    if (!isValid) return false // stop validating if error\n  }\n\n  log(`All files validated!\\n`)\n  return true\n}\n\nexport const parseDirectories = (directory: string, parser: Parser): DtdlObjectModel | null => {\n  log(`${parser.parserVersion()}\\n`)\n  log(`Parsing DTDL at: '${directory}'`)\n\n  const filepaths = searchForJsonFiles(directory)\n  if (filepaths.length < 1) return null\n\n  log(`Found ${filepaths.length} files:`)\n  log(filepaths)\n\n  const fullJson = combineJson(filepaths)\n  if (fullJson === null) return null\n\n  const fullModel = parseDtdl(JSON.stringify(fullJson), parser)\n  if (isModelingException(fullModel)) {\n    log('Error while parsing directories:')\n    log(fullModel)\n    return null\n  }\n\n  log(`All files parsed!\\n`)\n  log(`Entities:`)\n  log(Object.keys(fullModel))\n\n  // Example type guard\n  const interfaces: InterfaceInfo[] = Object.values(fullModel).filter(\n    (value): value is InterfaceInfo => value.EntityKind === 'Interface'\n  )\n  log(`Number of interfaces: ${interfaces.length}`)\n\n  return fullModel\n}\n"],"names":["fs","path","errorHandler","isModelingException","isResolutionException","log","error","console","getInterop","searchForJsonFiles","directory","existsSync","readdirSync","map","file","join","reduce","jsonFiles","fullPath","statSync","isDirectory","concat","extname","readJsonFile","filepath","readFileSync","JSON","parse","err","combineJson","filepaths","combinedJson","json","push","validateFile","parserModule","incResolutionException","parseDtdl","model","validateDirectories","parser","parserVersion","length","parseDirectories","fullJson","fullModel","stringify","Object","keys","interfaces","values","filter","value","EntityKind"],"mappings":"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"}

package/build/interop/_framework/blazor.boot.json

@@ -1,7 +1,7 @@
 {
   "mainAssemblyName": "DTDLParserJSInterop.dll",
   "resources": {
-    "hash": "sha256-5Jrl5g/jxN4caGaWoQxbSL7Ua34UxdnjQkvlMF8rgh8=",
+    "hash": "sha256-cRdOz9Znc6WDqNsoVHDBM1OD+PGmffsdKTPwvlofie4=",
     "jsModuleNative": {
       "dotnet.native.js": "sha256-9c6NfEin+DO/CvR62mlmht+z6oCLe/Hc5VNrykPh/S4="
     },
@@ -181,10 +181,10 @@
       "mscorlib.wasm": "sha256-Im6xq+lOse4P/VnAyrA3hwPstV67V5dB0EwQWcjipyE=",
       "netstandard.wasm": "sha256-PK0GLtj6kQVtZPzq0FZlnSdHh7geujg80LqKdJXA4pI=",
       "System.Private.CoreLib.wasm": "sha256-gEwccs7GbRSPGmeWBOKxNroYfyM+mZ7hqbP3ki1iwX0=",
-      "DTDLParserJSInterop.wasm": "sha256-BvkR2UPMnkeCIrxxrfeoSpJc93ZPGDTwHsvQB3hdt7w="
+      "DTDLParserJSInterop.wasm": "sha256-Ljz8bZ2SXnfWO0gMvc6prLC0VmajVMRhdOpuZEDMdOo="
     },
     "pdb": {
-      "DTDLParserJSInterop.pdb": "sha256-i3+PEeU6NCdviFY17aYVzGB6xAPV1F6QkwoDxz01uOs="
+      "DTDLParserJSInterop.pdb": "sha256-zPli60T0WJVIArZOl8ih0eKokXZGBH+DzPMHunlyJok="
     },
     "vfs": {
       "runtimeconfig.bin": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digicatapult/dtdl-parser",
-  "version": "0.2.30",
+  "version": "1.0.0",
   "description": "JS tool to parse DTDL defined Ontologies",
   "main": "build/index.js",
   "type": "module",