@digicatapult/dtdl-parser 0.0.88 → 0.1.0

package/build/index.d.ts

@@ -4,5 +4,6 @@ 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 validateDirectories: (directory: string, parser: Parser, incResolutionException: boolean) => boolean;
 export declare const parseDirectories: (directory: string, parser: Parser) => DtdlObjectModel | null;

package/build/index.js

@@ -27,9 +27,10 @@ let i = (r)=>{
         if (!a && l(e)) return n(`Successfully validated '${r}'`), !0;
         return s(`Error parsing '${r}'`), t(e), !1;
     }
-}, u = (e, r)=>{
+};
+export const parseDtdl = (e, r)=>{
     try {
-        let t = JSON.parse(r.parse(JSON.stringify(e)));
+        let t = JSON.parse(r.parse(e));
         return n("Successfully parsed"), t;
     } catch (e) {
         return s("Error parsing"), t(e), null;
@@ -49,7 +50,7 @@ export const parseDirectories = (e, r)=>{
     n(`Found ${t.length} files:`), n(t);
     let l = a(t);
     if (null === l) return null;
-    let s = u(l, r);
+    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);

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\nconst parseDtdl = (json: unknown[], parserModule: Parser): DtdlObjectModel | null => {\n  try {\n    const model = JSON.parse(parserModule.parse(JSON.stringify(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(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","stringify","validateDirectories","parser","parserVersion","length","parseDirectories","fullJson","fullModel","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 { 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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"}

package/build/interop/DTDLParserJSInterop.runtimeconfig.json

@@ -4,7 +4,7 @@
     "includedFrameworks": [
       {
         "name": "Microsoft.NETCore.App",
-        "version": "8.0.13"
+        "version": "8.0.14"
       }
     ],
     "wasmHostProperties": {