@code0-tech/definition-reader 0.0.17 → 0.0.18

package/dist/mapper/dataTypeMapper.d.ts

@@ -1,6 +1,6 @@
 import { DataType, DataTypeIdentifier } from '@code0-tech/sagittarius-graphql-types';
-import { DataTypeIdentifier as TucanaDataTypeIdentifier } from '@code0-tech/tucana/pb/shared.data_type_pb.ts';
-import { ConstructedDataTypes } from '../parser.ts';
+import { DataTypeIdentifier as TucanaDataTypeIdentifier } from '@code0-tech/tucana/pb/shared.data_type_pb.js';
+import { ConstructedDataTypes } from '../parser.js';
 declare function getDataType(identifier: string, constructedDataTypes: ConstructedDataTypes): DataType | null;
 declare function getDataTypeIdentifier(identifier: TucanaDataTypeIdentifier | undefined, constructedDataTypes: ConstructedDataTypes): DataTypeIdentifier | null;
 export { getDataType, getDataTypeIdentifier };

package/dist/mapper/flowTypeMapper.d.ts

@@ -1,5 +1,5 @@
-import { FlowType as TucanaFlowType } from '@code0-tech/tucana/pb/shared.flow_definition_pb.ts';
+import { FlowType as TucanaFlowType } from '@code0-tech/tucana/pb/shared.flow_definition_pb.js';
 import { FlowType } from '@code0-tech/sagittarius-graphql-types';
-import { ConstructedDataTypes } from '../parser.ts';
+import { ConstructedDataTypes } from '../parser.js';
 declare function mapFlowType(flowType: TucanaFlowType, constructed: ConstructedDataTypes): FlowType | null;
 export { mapFlowType };

package/dist/mapper/functionMapper.d.ts

@@ -1,5 +1,5 @@
 import { FunctionDefinition } from '@code0-tech/sagittarius-graphql-types';
-import { RuntimeFunctionDefinition as TucanaFunction } from '@code0-tech/tucana/pb/shared.runtime_function_pb.ts';
-import { ConstructedDataTypes } from '../parser.ts';
+import { RuntimeFunctionDefinition as TucanaFunction } from '@code0-tech/tucana/pb/shared.runtime_function_pb.js';
+import { ConstructedDataTypes } from '../parser.js';
 declare function mapFunction(func: TucanaFunction, constructed: ConstructedDataTypes): FunctionDefinition | null;
 export { mapFunction };

package/dist/parser.d.ts

@@ -1,6 +1,6 @@
-import { Feature } from './types.ts';
+import { Feature } from './types.js';
 import { DataType } from '@code0-tech/sagittarius-graphql-types';
-import { DefinitionDataType } from '@code0-tech/tucana/pb/shared.data_type_pb.ts';
+import { DefinitionDataType } from '@code0-tech/tucana/pb/shared.data_type_pb.js';
 export interface ConstructedDataTypes {
     scannedTucanaTypes: DefinitionDataType[];
     constructedDataTypes: DataType[];

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@code0-tech/definition-reader",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Reader for Code0-Definitions",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "build": "npx vite build"
+    "build": "vite build",
+    "start": "node ./dist/index.js",
+    "build:and:run": "vite build && node ./dist/index.js"
   },
   "author": "",
   "license": "",
@@ -28,9 +30,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@code0-tech/sagittarius-graphql-types": "^0.0.0-00f33663039d78ad59e95306730878c687de5c48",
-    "@code0-tech/tucana": "^0.0.37",
+    "@code0-tech/sagittarius-graphql-types": "^0.0.0-56198dce107a9c09cc5eca0773f239d9c3eba598",
+    "@code0-tech/tucana": "^0.0.39",
     "@protobuf-ts/runtime": "^2.11.1",
+    "@protobuf-ts/runtime-rpc": "^2.11.1",
     "vite-plugin-dts": "^4.5.4"
   }
 }

package/src/index.ts

@@ -1,2 +1,2 @@
-export { Definition } from './parser.ts';
+export { Definition } from './parser.js';
 export type { Feature } from './types.ts';

package/src/mapper/dataTypeMapper.ts

@@ -11,10 +11,11 @@ import {
 import {
     DataTypeIdentifier as TucanaDataTypeIdentifier,
     DefinitionDataType_Variant, DefinitionDataTypeRule, GenericMapper_GenericCombinationStrategy
-} from "@code0-tech/tucana/pb/shared.data_type_pb.ts"
-import {GenericMapper as TucanaGenericMapper} from "@code0-tech/tucana/pb/shared.data_type_pb.ts"
-import {ConstructedDataTypes, getID} from "../parser.ts";
-import {getTranslationConnection} from "./translation.ts";
+} from "@code0-tech/tucana/pb/shared.data_type_pb.js"
+import {GenericMapper as TucanaGenericMapper} from "@code0-tech/tucana/pb/shared.data_type_pb.js"
+import {ConstructedDataTypes, getID} from "../parser.js";
+import {getTranslationConnection} from "./translation.js";
+import {Value} from "@code0-tech/tucana/pb/shared.struct_pb.js";
 
 function getDataType(identifier: string, constructedDataTypes: ConstructedDataTypes): DataType | null {
     const dataType = constructedDataTypes.constructedDataTypes.find(dt => dt.identifier === identifier)
@@ -67,7 +68,7 @@ function createRules(rule: DefinitionDataTypeRule[], constructedDataTypes: Const
                     }
                     case "itemOfCollection": {
                         const ruleConfig: DataTypeRulesItemOfCollectionConfig = {
-                            items: r.config.itemOfCollection.items, //TODO: This needs to be checked
+                            items: r.config.itemOfCollection.items.map(valueToJSON),
                         }
                         const rule: DataTypeRule = {
                             variant: DataTypeRulesVariant.ItemOfCollection,
@@ -195,7 +196,7 @@ function getDataTypeIdentifier(identifier: TucanaDataTypeIdentifier | undefined,
                                     type: type
                                 }
                             }),
-                            sources: mapper.source.map(id =>
+                            sourceDataTypeIdentifiers: mapper.source.map(id =>
                                 getDataTypeIdentifier(id, constructedDataTypes)
                             ).filter(id => id != null),
                             target: mapper.target,
@@ -224,4 +225,27 @@ function getDataTypeIdentifier(identifier: TucanaDataTypeIdentifier | undefined,
     return null;
 }
 
+// @ts-ignore
+function valueToJSON(value: Value) {
+    switch (value.kind.oneofKind) {
+        case "nullValue":
+            return null
+        case "numberValue":
+            return value.kind.numberValue
+        case "stringValue":
+            return value.kind.stringValue
+        case "boolValue":
+            return value.kind.boolValue
+        case "structValue":
+            return Object.fromEntries(
+                // @ts-ignore
+                Object.entries(value.kind.structValue.fields).map(([k, v]) => {
+                    return  [k, valueToJSON(v)]
+                })
+            )
+        case "listValue":
+            return value.kind.listValue.values.map(valueToJSON)
+    }
+}
+
 export {getDataType, getDataTypeIdentifier}

package/src/mapper/flowTypeMapper.ts

@@ -1,7 +1,7 @@
-import {FlowType as TucanaFlowType, FlowTypeSetting as TucanaFlowTypeSetting} from "@code0-tech/tucana/pb/shared.flow_definition_pb.ts"
+import {FlowType as TucanaFlowType, FlowTypeSetting as TucanaFlowTypeSetting} from "@code0-tech/tucana/pb/shared.flow_definition_pb.js"
 import {FlowType, FlowTypeSetting} from "@code0-tech/sagittarius-graphql-types";
-import {getDataType} from "./dataTypeMapper.ts";
-import {ConstructedDataTypes, getID} from "../parser.ts";
+import {getDataType} from "./dataTypeMapper.js";
+import {ConstructedDataTypes, getID} from "../parser.js";
 import {getTranslationConnection} from "./translation.js";
 
 function mapFlowType(flowType: TucanaFlowType, constructed: ConstructedDataTypes): FlowType | null {

package/src/mapper/functionMapper.ts

@@ -2,9 +2,9 @@ import {FunctionDefinition, ParameterDefinitionConnection} from "@code0-tech/sag
 import {
     RuntimeFunctionDefinition as TucanaFunction,
     RuntimeParameterDefinition
-} from "@code0-tech/tucana/pb/shared.runtime_function_pb.ts";
-import {getDataTypeIdentifier} from "./dataTypeMapper.ts";
-import {ConstructedDataTypes, getID} from "../parser.ts";
+} from "@code0-tech/tucana/pb/shared.runtime_function_pb.js";
+import {getDataTypeIdentifier} from "./dataTypeMapper.js";
+import {ConstructedDataTypes, getID} from "../parser.js";
 import {getTranslationConnection} from "./translation.js";
 
 function mapFunction(func: TucanaFunction, constructed: ConstructedDataTypes): FunctionDefinition | null {
@@ -18,6 +18,10 @@ function mapFunction(func: TucanaFunction, constructed: ConstructedDataTypes): F
         throwsError: func.throwsError,
         returnType: getDataTypeIdentifier(func.returnTypeIdentifier, constructed),
         parameterDefinitions: getParameterDefinitionConnection(func.runtimeParameterDefinitions, constructed),
+         runtimeFunctionDefinition: {
+             id: `gid://sagittarius/RuntimeFunctionDefinition/${getID(constructed)}`,
+             identifier: func.runtimeName
+         }
     }
 }
 
@@ -28,9 +32,10 @@ function getParameterDefinitionConnection(def: RuntimeParameterDefinition[], con
             return {
                 id: `gid://sagittarius/ParameterDefinition/${getID(constructed)}`,
                 names: getTranslationConnection(node.name),
+                identifier: node.runtimeName,
                 descriptions: getTranslationConnection(node.description),
                 documentations: getTranslationConnection(node.documentation),
-                dataType: getDataTypeIdentifier(node.dataTypeIdentifier, constructed)
+                dataTypeIdentifier: getDataTypeIdentifier(node.dataTypeIdentifier, constructed)
             }
         })
     }

package/src/parser.ts

@@ -1,14 +1,14 @@
-import {DefinitionDataType as TucanaDataType} from "@code0-tech/tucana/pb/shared.data_type_pb.ts";
-import {Feature} from "./types.ts";
+import {DefinitionDataType as TucanaDataType} from "@code0-tech/tucana/pb/shared.data_type_pb.js";
+import {Feature} from "./types.js";
 import {readdirSync, readFileSync} from "node:fs";
-import {FlowType as TucanaFlowType} from "@code0-tech/tucana/pb/shared.flow_definition_pb.ts";
-import {RuntimeFunctionDefinition as TucanaFunction} from "@code0-tech/tucana/pb/shared.runtime_function_pb.ts";
+import {FlowType as TucanaFlowType} from "@code0-tech/tucana/pb/shared.flow_definition_pb.js";
+import {RuntimeFunctionDefinition as TucanaFunction} from "@code0-tech/tucana/pb/shared.runtime_function_pb.js";
 import path from "node:path";
-import {mapFlowType} from "./mapper/flowTypeMapper.ts";
-import {mapFunction} from "./mapper/functionMapper.ts";
+import {mapFlowType} from "./mapper/flowTypeMapper.js";
+import {mapFunction} from "./mapper/functionMapper.js";
 import {DataType} from "@code0-tech/sagittarius-graphql-types";
-import {DefinitionDataType} from "@code0-tech/tucana/pb/shared.data_type_pb.ts";
-import {getDataType} from "./mapper/dataTypeMapper.ts";
+import {DefinitionDataType} from "@code0-tech/tucana/pb/shared.data_type_pb.js";
+import {getDataType} from "./mapper/dataTypeMapper.js";
 
 export interface ConstructedDataTypes {
     scannedTucanaTypes: DefinitionDataType[]