@digicatapult/dtdl-parser 0.0.7 → 0.0.8

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

@@ -1,7 +1,7 @@
 {
   "mainAssemblyName": "DTDLParserJSInterop.dll",
   "resources": {
-    "hash": "sha256-olJYYe2N3TkMwzr5gLmBWF6LUzy5jATth5CZHgcFAhQ=",
+    "hash": "sha256-jxco9N/N9/Ae9ULFX3qcTo5Eg4Ixu6iVG/uH30FZi5s=",
     "jsModuleNative": {
       "dotnet.native.js": "sha256-79LdZogK41buIci0KtOWmQvQc2swMI3jvDQCoN23NBM="
     },
@@ -181,10 +181,10 @@
       "mscorlib.wasm": "sha256-KvqZaNpjwhrOuzE4b4aMFsI+VUTyiWfoDI4zn4l9BM8=",
       "netstandard.wasm": "sha256-v+s7sWxtOM6bnOvC0jFrtnm6uMfbDymwl2nHNgbS2LM=",
       "System.Private.CoreLib.wasm": "sha256-pklll63uFQoY6vaD3vbluS9osYiJWLLLmob1yHFgepI=",
-      "DTDLParserJSInterop.wasm": "sha256-00wSZrEvxZ1bAVcXjupGHdQ4Yzs+fWNWoeu+r0eYpHI="
+      "DTDLParserJSInterop.wasm": "sha256-V3NQJLkSLufmYpny2vSS5Cb9VtabBvvbBr95f8FJrBM="
     },
     "pdb": {
-      "DTDLParserJSInterop.pdb": "sha256-o7QV6voz8eRmbUyIEU0huvUIbOJwpeJR+OO+9nLD4j0="
+      "DTDLParserJSInterop.pdb": "sha256-hde5zESc+GtUEF9ae8Rt+SfLUstbeJDzUoFE87mieUw="
     },
     "vfs": {
       "runtimeconfig.bin": {

package/build/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@digicatapult/dtdl-parser",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "JS tool to parse DTDL defined Ontologies",
-  "main": "src/index.ts",
+  "main": "./src/index.js",
   "type": "module",
   "scripts": {
     "test": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json ./src/**/*.test.ts",

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@digicatapult/dtdl-parser",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "JS tool to parse DTDL defined Ontologies",
-  "main": "src/index.ts",
+  "main": "./src/index.js",
   "type": "module",
   "scripts": {
     "test": "NODE_ENV=test ./node_modules/.bin/mocha --config ./test/mocharc.json ./src/**/*.test.ts",

package/src/index.ts

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