node-opcua-factory 2.73.1 → 2.76.0

package/dist/types.d.ts

@@ -1,151 +1,151 @@
-/**
- * @module node-opcua-factory
- */
-import { BinaryStream, OutputBinaryStream } from "node-opcua-binary-stream";
-import { Enum } from "node-opcua-enum";
-import { ExpandedNodeId, NodeId } from "node-opcua-nodeid";
-export declare enum FieldCategory {
-    enumeration = "enumeration",
-    complex = "complex",
-    basic = "basic"
-}
-export interface CommonInterface {
-    name: string;
-    defaultValue?: any;
-    encode?: (value: any, stream: OutputBinaryStream) => void;
-    decode?: (stream: BinaryStream) => any;
-    coerce?: (value: any) => any;
-    toJSON?: (value: any) => any;
-    category: FieldCategory;
-    random?: () => any;
-    validate?: (value: any) => void;
-    computer_default_value(defaultValue: any): any;
-    subType: string;
-    isAbstract: boolean;
-    isSubTypeOf(type: CommonInterface): boolean;
-}
-export interface FieldInterfaceOptions {
-    name: string;
-    defaultValue?: any | DefaultValueFunc;
-    fieldType: string;
-    isArray?: boolean;
-    documentation?: string;
-    category?: FieldCategory;
-    schema?: CommonInterface;
-    switchBit?: number;
-    switchValue?: number;
-    allowSubType?: boolean;
-    dataType?: NodeId;
-    basicDataType?: number;
-}
-export declare type Func1<T> = (value: any, field: StructuredTypeField, data: T, args?: any) => void;
-export interface DecodeDebugOptions {
-    tracer: any;
-    name: string;
-}
-export interface IBaseUAObject {
-    schema: IStructuredTypeSchema;
-    encode(stream: OutputBinaryStream): void;
-    decode(stream: BinaryStream): void;
-    binaryStoreSize(): number;
-    toString(...args: any[]): string;
-    isValid(): boolean;
-    explore(): string;
-    applyOnAllFields<T>(func: Func1<T>, data: T): void;
-    toJSON(): any;
-    decodeDebug(stream: BinaryStream, options: DecodeDebugOptions): void;
-    clone(): IBaseUAObject;
-}
-declare type BaseUAObjectConstructable = new (options?: any) => IBaseUAObject;
-export declare type ConstructorFunc = BaseUAObjectConstructable;
-export interface ConstructorFuncWithSchema extends ConstructorFunc {
-    schema: IStructuredTypeSchema;
-    possibleFields: string[];
-    encodingDefaultBinary: ExpandedNodeId;
-    encodingDefaultXml: ExpandedNodeId;
-    encodingDefaultJson?: ExpandedNodeId;
-}
-export interface StructuredTypeField {
-    name: string;
-    originalName: string;
-    fieldType: string;
-    isArray?: boolean;
-    documentation?: string;
-    category: FieldCategory;
-    defaultValue?: any | DefaultValueFunc;
-    schema: CommonInterface;
-    switchBit?: number;
-    switchValue?: number;
-    allowSubType?: boolean;
-    dataType?: NodeId;
-    basicDataType?: number;
-    fieldTypeConstructor?: ConstructorFunc;
-    subType?: string;
-    validate?: (value: any) => boolean;
-    decode?: (stream: BinaryStream) => any;
-}
-export interface FieldEnumeration extends StructuredTypeField {
-}
-export interface FieldComplex extends StructuredTypeField {
-}
-export interface FieldBasic extends StructuredTypeField {
-}
-export declare type FieldType = FieldEnumeration | FieldComplex | FieldBasic;
-export declare type DefaultValueFunc = () => any;
-export interface StructuredTypeOptions {
-    name: string;
-    id?: number | NodeId;
-    fields: FieldInterfaceOptions[];
-    documentation?: string;
-    baseType: string;
-    _resolved?: boolean;
-    bitFields?: any[];
-    base?: StructuredTypeOptions;
-}
-export interface TypeSchemaConstructorOptions {
-    name: string;
-    subType?: string;
-    isAbstract?: boolean;
-    category?: FieldCategory;
-    defaultValue?: any;
-    encode?: (value: any, stream: OutputBinaryStream) => void;
-    decode?: (stream: BinaryStream) => any;
-    coerce?: (value: any) => any;
-}
-export interface BasicTypeDefinitionOptionsB extends TypeSchemaConstructorOptions {
-    toJSON?: (value: any) => any;
-    random?: () => any;
-    validate?: (value: any) => void;
-}
-export interface BasicTypeDefinitionOptionsBase extends BasicTypeDefinitionOptionsB {
-}
-export interface BasicTypeDefinitionOptions extends BasicTypeDefinitionOptionsB {
-    subType: string;
-}
-export interface BasicTypeDefinition extends CommonInterface {
-    subType: string;
-}
-export interface BuiltInTypeDefinition extends BasicTypeDefinition {
-}
-export interface EnumerationDefinition extends CommonInterface {
-    typedEnum: Enum;
-    documentation?: string;
-}
-export declare type TypeDefinition = BuiltInTypeDefinition | EnumerationDefinition | BasicTypeDefinition | CommonInterface;
-export interface IStructuredTypeSchema extends CommonInterface {
-    fields: FieldType[];
-    id: NodeId;
-    dataTypeNodeId: NodeId;
-    baseType: string;
-    _possibleFields: string[];
-    _baseSchema: IStructuredTypeSchema | null;
-    documentation?: string;
-    isValid?: (options: any) => boolean;
-    decodeDebug?: (stream: BinaryStream, options: any) => any;
-    constructHook?: (options: any) => any;
-    encodingDefaultBinary?: ExpandedNodeId;
-    encodingDefaultXml?: ExpandedNodeId;
-    encodingDefaultJson?: ExpandedNodeId;
-    bitFields?: any[];
-}
-export {};
+/**
+ * @module node-opcua-factory
+ */
+import { BinaryStream, OutputBinaryStream } from "node-opcua-binary-stream";
+import { Enum } from "node-opcua-enum";
+import { ExpandedNodeId, NodeId } from "node-opcua-nodeid";
+export declare enum FieldCategory {
+    enumeration = "enumeration",
+    complex = "complex",
+    basic = "basic"
+}
+export interface CommonInterface {
+    name: string;
+    defaultValue?: any;
+    encode?: (value: any, stream: OutputBinaryStream) => void;
+    decode?: (stream: BinaryStream) => any;
+    coerce?: (value: any) => any;
+    toJSON?: (value: any) => any;
+    category: FieldCategory;
+    random?: () => any;
+    validate?: (value: any) => void;
+    computer_default_value(defaultValue: any): any;
+    subType: string;
+    isAbstract: boolean;
+    isSubTypeOf(type: CommonInterface): boolean;
+}
+export interface FieldInterfaceOptions {
+    name: string;
+    defaultValue?: any | DefaultValueFunc;
+    fieldType: string;
+    isArray?: boolean;
+    documentation?: string;
+    category?: FieldCategory;
+    schema?: CommonInterface;
+    switchBit?: number;
+    switchValue?: number;
+    allowSubType?: boolean;
+    dataType?: NodeId;
+    basicDataType?: number;
+}
+export declare type Func1<T> = (value: any, field: StructuredTypeField, data: T, args?: any) => void;
+export interface DecodeDebugOptions {
+    tracer: any;
+    name: string;
+}
+export interface IBaseUAObject {
+    schema: IStructuredTypeSchema;
+    encode(stream: OutputBinaryStream): void;
+    decode(stream: BinaryStream): void;
+    binaryStoreSize(): number;
+    toString(...args: any[]): string;
+    isValid(): boolean;
+    explore(): string;
+    applyOnAllFields<T>(func: Func1<T>, data: T): void;
+    toJSON(): any;
+    decodeDebug(stream: BinaryStream, options: DecodeDebugOptions): void;
+    clone(): IBaseUAObject;
+}
+declare type BaseUAObjectConstructable = new (options?: any) => IBaseUAObject;
+export declare type ConstructorFunc = BaseUAObjectConstructable;
+export interface ConstructorFuncWithSchema extends ConstructorFunc {
+    schema: IStructuredTypeSchema;
+    possibleFields: string[];
+    encodingDefaultBinary: ExpandedNodeId;
+    encodingDefaultXml: ExpandedNodeId;
+    encodingDefaultJson?: ExpandedNodeId;
+}
+export interface StructuredTypeField {
+    name: string;
+    originalName: string;
+    fieldType: string;
+    isArray?: boolean;
+    documentation?: string;
+    category: FieldCategory;
+    defaultValue?: any | DefaultValueFunc;
+    schema: CommonInterface;
+    switchBit?: number;
+    switchValue?: number;
+    allowSubType?: boolean;
+    dataType?: NodeId;
+    basicDataType?: number;
+    fieldTypeConstructor?: ConstructorFunc;
+    subType?: string;
+    validate?: (value: any) => boolean;
+    decode?: (stream: BinaryStream) => any;
+}
+export interface FieldEnumeration extends StructuredTypeField {
+}
+export interface FieldComplex extends StructuredTypeField {
+}
+export interface FieldBasic extends StructuredTypeField {
+}
+export declare type FieldType = FieldEnumeration | FieldComplex | FieldBasic;
+export declare type DefaultValueFunc = () => any;
+export interface StructuredTypeOptions {
+    name: string;
+    id?: number | NodeId;
+    fields: FieldInterfaceOptions[];
+    documentation?: string;
+    baseType: string;
+    _resolved?: boolean;
+    bitFields?: any[];
+    base?: StructuredTypeOptions;
+}
+export interface TypeSchemaConstructorOptions {
+    name: string;
+    subType?: string;
+    isAbstract?: boolean;
+    category?: FieldCategory;
+    defaultValue?: any;
+    encode?: (value: any, stream: OutputBinaryStream) => void;
+    decode?: (stream: BinaryStream) => any;
+    coerce?: (value: any) => any;
+}
+export interface BasicTypeDefinitionOptionsB extends TypeSchemaConstructorOptions {
+    toJSON?: (value: any) => any;
+    random?: () => any;
+    validate?: (value: any) => void;
+}
+export interface BasicTypeDefinitionOptionsBase extends BasicTypeDefinitionOptionsB {
+}
+export interface BasicTypeDefinitionOptions extends BasicTypeDefinitionOptionsB {
+    subType: string;
+}
+export interface BasicTypeDefinition extends CommonInterface {
+    subType: string;
+}
+export interface BuiltInTypeDefinition extends BasicTypeDefinition {
+}
+export interface EnumerationDefinition extends CommonInterface {
+    typedEnum: Enum;
+    documentation?: string;
+}
+export declare type TypeDefinition = BuiltInTypeDefinition | EnumerationDefinition | BasicTypeDefinition | CommonInterface;
+export interface IStructuredTypeSchema extends CommonInterface {
+    fields: FieldType[];
+    id: NodeId;
+    dataTypeNodeId: NodeId;
+    baseType: string;
+    _possibleFields: string[];
+    _baseSchema: IStructuredTypeSchema | null;
+    documentation?: string;
+    isValid?: (options: any) => boolean;
+    decodeDebug?: (stream: BinaryStream, options: any) => any;
+    constructHook?: (options: any) => any;
+    encodingDefaultBinary?: ExpandedNodeId;
+    encodingDefaultXml?: ExpandedNodeId;
+    encodingDefaultJson?: ExpandedNodeId;
+    bitFields?: any[];
+}
+export {};

package/dist/types.js

@@ -1,10 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FieldCategory = void 0;
-var FieldCategory;
-(function (FieldCategory) {
-    FieldCategory["enumeration"] = "enumeration";
-    FieldCategory["complex"] = "complex";
-    FieldCategory["basic"] = "basic";
-})(FieldCategory = exports.FieldCategory || (exports.FieldCategory = {}));
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FieldCategory = void 0;
+var FieldCategory;
+(function (FieldCategory) {
+    FieldCategory["enumeration"] = "enumeration";
+    FieldCategory["complex"] = "complex";
+    FieldCategory["basic"] = "basic";
+})(FieldCategory = exports.FieldCategory || (exports.FieldCategory = {}));
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-opcua-factory",
-    "version": "2.73.1",
+    "version": "2.76.0",
     "description": "pure nodejs OPCUA SDK - module -factory",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -11,18 +11,21 @@
         "clean": "npx rimraf dist *.tsbuildinfo",
         "test": "mocha"
     },
+    "devDependencies": {
+        "should": "^13.2.3"
+    },
     "dependencies": {
         "chalk": "4.1.2",
-        "node-opcua-assert": "2.66.0",
-        "node-opcua-basic-types": "2.73.0",
-        "node-opcua-binary-stream": "2.73.0",
-        "node-opcua-constants": "2.70.0",
-        "node-opcua-debug": "2.71.0",
-        "node-opcua-enum": "2.71.0",
-        "node-opcua-guid": "2.66.0",
-        "node-opcua-nodeid": "2.71.0",
-        "node-opcua-status-code": "2.73.0",
-        "node-opcua-utils": "2.71.0"
+        "node-opcua-assert": "2.76.0",
+        "node-opcua-basic-types": "2.76.0",
+        "node-opcua-binary-stream": "2.76.0",
+        "node-opcua-constants": "2.74.0",
+        "node-opcua-debug": "2.76.0",
+        "node-opcua-enum": "2.76.0",
+        "node-opcua-guid": "2.76.0",
+        "node-opcua-nodeid": "2.76.0",
+        "node-opcua-status-code": "2.76.0",
+        "node-opcua-utils": "2.76.0"
     },
     "author": "Etienne Rossignon",
     "license": "MIT",
@@ -39,5 +42,5 @@
         "internet of things"
     ],
     "homepage": "http://node-opcua.github.io/",
-    "gitHead": "684a796e88e1732f418f2ada6aca2808e0115de8"
+    "gitHead": "75d9b8cf894c8fbadf77d2c4a48a730d055465e7"
 }

package/source/datatype_factory.ts

@@ -5,7 +5,7 @@ import * as util from "util";
 import * as chalk from "chalk";
 
 import { assert } from "node-opcua-assert";
-import { checkDebugFlag, make_debugLog } from "node-opcua-debug";
+import { checkDebugFlag, make_debugLog, make_warningLog } from "node-opcua-debug";
 import { ExpandedNodeId, NodeId } from "node-opcua-nodeid";
 import { DataTypeIds } from "node-opcua-constants";
 
@@ -22,6 +22,7 @@ import {
 
 const debugLog = make_debugLog(__filename);
 const doDebug = checkDebugFlag(__filename);
+const warningLog = make_warningLog(__filename);
 
 export function _findFieldSchema(typeDictionary: DataTypeFactory, field: StructuredTypeField, value: any): IStructuredTypeSchema {
     const fieldType = field.fieldType;
@@ -293,11 +294,13 @@ export class DataTypeFactory {
     }
 
     private _registerFactory(dataTypeNodeId: NodeId, typeName: string, constructor: ConstructorFuncWithSchema): void {
+
         /* istanbul ignore next */
-        if (this.hasStructuredType(typeName)) {
-            console.log(this.getStructureTypeConstructor(typeName));
-            console.log("target namespace =", this.targetNamespace);
-            throw new Error(" registerFactory  : " + typeName + " already registered");
+        if (this._structureTypeConstructorByNameMap.has(typeName)) {
+            warningLog(this.getStructureTypeConstructor(typeName));
+            warningLog("target namespace = `" + this.targetNamespace + "`");
+            warningLog(" registerFactory  : " + typeName + " already registered. dataTypeNodeId=", dataTypeNodeId.toString());
+            return;
         }
         debugLog("registering typeName ", typeName, dataTypeNodeId.toString());
         this._structureTypeConstructorByNameMap.set(typeName, constructor);

package/dist/constructor_type.d.ts

@@ -1,15 +0,0 @@
-/**
- * @module node-opcua-factory
- */
-import { ExpandedNodeId } from "node-opcua-nodeid";
-import { BaseUAObject } from "./factories_baseobject";
-import { StructuredTypeSchema } from "./factories_structuredTypeSchema";
-declare type BaseUAObjectConstructable = new (options?: any) => BaseUAObject;
-export declare type ConstructorFunc = BaseUAObjectConstructable;
-export interface ConstructorFuncWithSchema extends ConstructorFunc {
-    schema: StructuredTypeSchema;
-    possibleFields: string[];
-    encodingDefaultBinary: ExpandedNodeId;
-    encodingDefaultXml: ExpandedNodeId;
-}
-export {};

package/dist/constructor_type.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=constructor_type.js.map

package/dist/constructor_type.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constructor_type.js","sourceRoot":"","sources":["../source/constructor_type.ts"],"names":[],"mappings":""}

package/dist/factories_baseobject.d.ts

@@ -1,56 +0,0 @@
-import { BinaryStream, OutputBinaryStream } from "node-opcua-binary-stream";
-import { StructuredTypeSchema } from "./factories_structuredTypeSchema";
-export interface DecodeDebugOptions {
-    tracer: any;
-    name: string;
-}
-export interface BaseUAObject {
-    schema: StructuredTypeSchema;
-}
-/**
- * @class BaseUAObject
- * @constructor
- */
-export declare class BaseUAObject {
-    constructor();
-    /**
-     * Encode the object to the binary stream.
-     * @class BaseUAObject
-     * @method encode
-     * @param stream {BinaryStream}
-     */
-    encode(stream: OutputBinaryStream): void;
-    /**
-     * Decode the object from the binary stream.
-     * @class BaseUAObject
-     * @method decode
-     * @param stream {BinaryStream}
-     */
-    decode(stream: BinaryStream): void;
-    /**
-     * Calculate the required size to store this object in a binary stream.
-     * @method binaryStoreSize
-     * @return number
-     */
-    binaryStoreSize(): number;
-    /**
-     * @method toString
-     * @return {String}
-     */
-    toString(...args: any[]): string;
-    /**
-     *
-     * verify that all object attributes values are valid according to schema
-     * @method isValid
-     * @return boolean
-     */
-    isValid(): boolean;
-    /**
-     * @method decodeDebug
-     *
-     */
-    decodeDebug(stream: BinaryStream, options: DecodeDebugOptions): void;
-    explore(): string;
-    toJSON(): any;
-    clone(): any;
-}