@digicatapult/dtdl-parser 0.0.14 → 0.0.16

package/src/error.ts

@@ -1,25 +0,0 @@
-import type { ModelingException, ParsingException, ResolutionException } from '../types/DtdlErr.d.ts'
-
-const { error } = console
-
-const isParsingEx = (exception: ModelingException): exception is ParsingException => {
-  return exception.ExceptionKind === 'Parsing'
-}
-
-const isResolutionEx = (exception: ModelingException): exception is ResolutionException => {
-  return exception.ExceptionKind === 'Resolution'
-}
-
-export const isResolutionException = (err: unknown) => {
-  if (!(err instanceof Error)) return false
-  return isResolutionEx(JSON.parse(err.message))
-}
-
-export const errorHandler = (err: unknown) => {
-  if (!(err instanceof Error)) return error(`Unexpected error: ${err}`)
-
-  const exception = JSON.parse(err.message) as ModelingException
-
-  if (!(isParsingEx(exception) || isResolutionEx(exception))) error('Unknown exception type')
-  error(exception)
-}

package/src/index.ts

@@ -1,134 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import type { DtdlObjectModel, InterfaceInfo } from '../types/DtdlOm.d.ts'
-import { errorHandler, isResolutionException } from './error.js'
-import type { Parser } from './interop.js'
-
-const { log, error } = console
-
-export type * from '../types/DtdlErr.d.ts'
-export type * from '../types/DtdlOm.d.ts'
-export { getInterop } from './interop.js'
-
-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
-}

package/src/interop/DTDLParserJSInterop.csproj

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
-    <OutputType>Exe</OutputType>
-    <WasmMainJSPath>modelParser.js</WasmMainJSPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <RunAOTCompilation>false</RunAOTCompilation>
-    <PublishTrimmed>true</PublishTrimmed>
-    <InvariantGlobalization>true</InvariantGlobalization>
-    <EmccInitialHeapSize>16mb</EmccInitialHeapSize>
-    <DebuggerSupport>false</DebuggerSupport>
-    <UseSystemResourceKeys>true</UseSystemResourceKeys>
-    <EventSourceSupport>false</EventSourceSupport>
-    <WasmEmitSymbolMap>false</WasmEmitSymbolMap>
-    <WasmAppDir>../../build/interop</WasmAppDir>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <WasmExtraFilesToDeploy Include="modelParser.js" />
-  </ItemGroup>
- 
-  <ItemGroup>
-    <PackageReference Include="DTDLParser" Version="1.0.52" />
-  </ItemGroup>
-</Project>

package/src/interop/LICENSE

@@ -1,21 +0,0 @@
-    MIT License
-
-    Copyright (c) Digital Twin Consortium and contributors.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE

package/src/interop/ModelParserInterop.cs

@@ -1,19 +0,0 @@
-using DTDLParser;
-using System;
-using System.Runtime.InteropServices.JavaScript;
-using System.Runtime.Versioning;
-
-namespace DtdlParserJSInterop;
-
-[SupportedOSPlatform("browser")]
-public partial class ModelParserInterop
-{
-    public static void Main() => Console.WriteLine("dotnet loaded");
-
-    [JSExport]
-    public static string ParserVersion() => typeof(ModelParser).Assembly.FullName;
-
-    [JSExport]
-    public static string Parse(string dtdl) => new ModelParser().ParseToJson(dtdl);
-
-}

package/src/interop/README.md

@@ -1 +0,0 @@
-This directory modifies code from `DTDLParser for .NET`, licensed under an [MIT License](./LICENSE). You can find the original project [here](https://github.com/digitaltwinconsortium/DTDLParser).