node-opcua-enum 2.63.2 → 2.66.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/enum.d.ts +6 -2
- package/dist/enum.js +20 -8
- package/dist/enum.js.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/package.json +5 -5
- package/source/enum.ts +33 -25
package/dist/enum.d.ts
CHANGED
|
@@ -49,6 +49,10 @@ export declare class EnumItem {
|
|
|
49
49
|
*/
|
|
50
50
|
valueOf(): number;
|
|
51
51
|
}
|
|
52
|
+
export interface _TypescriptEnum {
|
|
53
|
+
[key: string | number]: number | string;
|
|
54
|
+
}
|
|
55
|
+
export declare function adaptTypescriptEnum(map: _TypescriptEnum | string[]): _TypescriptEnum;
|
|
52
56
|
/**
|
|
53
57
|
* @class Enum
|
|
54
58
|
* @constructor
|
|
@@ -58,7 +62,7 @@ export declare class EnumItem {
|
|
|
58
62
|
export declare class Enum {
|
|
59
63
|
private readonly enumItems;
|
|
60
64
|
private readonly _isFlaggable;
|
|
61
|
-
constructor(map:
|
|
65
|
+
constructor(map: _TypescriptEnum | string[]);
|
|
62
66
|
get isFlaggable(): boolean;
|
|
63
67
|
/**
|
|
64
68
|
* Returns the appropriate EnumItem.
|
|
@@ -66,7 +70,7 @@ export declare class Enum {
|
|
|
66
70
|
* @param key The object to get with.
|
|
67
71
|
* @return the get result.
|
|
68
72
|
*/
|
|
69
|
-
get(key: EnumItem | string | number):
|
|
73
|
+
get(key: EnumItem | string | number): EnumItem | null;
|
|
70
74
|
getDefaultValue(): EnumItem;
|
|
71
75
|
toString(): string;
|
|
72
76
|
private _getByString;
|
package/dist/enum.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
// tslint:disable:no-bitwise
|
|
7
7
|
// tslint:disable:max-classes-per-file
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.Enum = exports.EnumItem = void 0;
|
|
9
|
+
exports.Enum = exports.adaptTypescriptEnum = exports.EnumItem = void 0;
|
|
10
10
|
/**
|
|
11
11
|
* Represents an Item of an Enum.
|
|
12
12
|
*
|
|
@@ -83,7 +83,7 @@ class EnumItem {
|
|
|
83
83
|
}
|
|
84
84
|
exports.EnumItem = EnumItem;
|
|
85
85
|
function powerOfTwo(n) {
|
|
86
|
-
return n &&
|
|
86
|
+
return n && !(n & (n - 1)) ? true : false;
|
|
87
87
|
}
|
|
88
88
|
// check if enum is flaggable
|
|
89
89
|
function checkIsFlaggable(enums) {
|
|
@@ -92,12 +92,25 @@ function checkIsFlaggable(enums) {
|
|
|
92
92
|
if (isNaN(value)) {
|
|
93
93
|
continue; // skipping none number value
|
|
94
94
|
}
|
|
95
|
-
if (
|
|
95
|
+
if (value !== 0 && value !== 1 && !powerOfTwo(value)) {
|
|
96
96
|
return false;
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
return true;
|
|
100
100
|
}
|
|
101
|
+
function adaptTypescriptEnum(map) {
|
|
102
|
+
if (Array.isArray(map)) {
|
|
103
|
+
let mm = null;
|
|
104
|
+
// create map as flaggable enum
|
|
105
|
+
mm = {};
|
|
106
|
+
for (let i = 0; i < map.length; i++) {
|
|
107
|
+
mm[map[i]] = 1 << i;
|
|
108
|
+
}
|
|
109
|
+
return mm;
|
|
110
|
+
}
|
|
111
|
+
return map;
|
|
112
|
+
}
|
|
113
|
+
exports.adaptTypescriptEnum = adaptTypescriptEnum;
|
|
101
114
|
/**
|
|
102
115
|
* @class Enum
|
|
103
116
|
* @constructor
|
|
@@ -110,17 +123,16 @@ class Enum {
|
|
|
110
123
|
let mm = null;
|
|
111
124
|
let isFlaggable = null;
|
|
112
125
|
if (Array.isArray(map)) {
|
|
113
|
-
|
|
114
|
-
mm = {};
|
|
115
|
-
for (let i = 0; i < map.length; i++) {
|
|
116
|
-
mm[map[i]] = 1 << i;
|
|
117
|
-
}
|
|
126
|
+
mm = adaptTypescriptEnum(map);
|
|
118
127
|
isFlaggable = true;
|
|
119
128
|
}
|
|
120
129
|
else {
|
|
121
130
|
mm = map;
|
|
122
131
|
}
|
|
123
132
|
for (const key of Object.keys(mm)) {
|
|
133
|
+
if (typeof key !== "string") {
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
124
136
|
const val = mm[key];
|
|
125
137
|
if (undefined === val) {
|
|
126
138
|
continue;
|
package/dist/enum.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../source/enum.ts"],"names":[],"mappings":";AAAA;;;GAGG;AACH,4BAA4B;AAC5B,sCAAsC;;;AAEtC;;;;GAIG;AACH,MAAa,QAAQ;IAIjB;;;;OAIG;IACH,YAAmB,GAAW,EAAE,KAAa;QACzC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;;OAKG;IACI,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../source/enum.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../source/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;GAGG;AACH,yCAAuB"}
|
package/package.json
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-opcua-enum",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.66.0",
|
|
4
4
|
"description": "pure nodejs OPCUA SDK - module -enum",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc -b",
|
|
7
7
|
"lint": "eslint source/**/*.ts",
|
|
8
|
-
"clean": "
|
|
8
|
+
"clean": "npx rimraf dist *.tsbuildinfo",
|
|
9
9
|
"test": "mocha"
|
|
10
10
|
},
|
|
11
11
|
"main": "./dist/index.js",
|
|
12
12
|
"@types": "./dist/index.d.ts",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"node-opcua-assert": "2.
|
|
14
|
+
"node-opcua-assert": "2.66.0"
|
|
15
15
|
},
|
|
16
16
|
"devDependencies": {
|
|
17
17
|
"enum": "3.0.4",
|
|
18
|
-
"node-opcua-benchmarker": "2.
|
|
18
|
+
"node-opcua-benchmarker": "2.66.0",
|
|
19
19
|
"should": "^13.2.3"
|
|
20
20
|
},
|
|
21
21
|
"author": "Etienne Rossignon",
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"internet of things"
|
|
34
34
|
],
|
|
35
35
|
"homepage": "http://node-opcua.github.io/",
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "97f47e2e242a1fd737495fd64cb65e8fb7a9964b"
|
|
37
37
|
}
|
package/source/enum.ts
CHANGED
|
@@ -30,7 +30,7 @@ export class EnumItem {
|
|
|
30
30
|
* @param {EnumItem | String | Number} item The object to check with.
|
|
31
31
|
* @return {Boolean} The check result.
|
|
32
32
|
*/
|
|
33
|
-
public is(item: EnumItem|string|number): boolean {
|
|
33
|
+
public is(item: EnumItem | string | number): boolean {
|
|
34
34
|
if (item instanceof EnumItem) {
|
|
35
35
|
return this.value === item.value;
|
|
36
36
|
} else if (typeof item === "string") {
|
|
@@ -86,24 +86,40 @@ export class EnumItem {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
|
|
89
|
-
function powerOfTwo(n: number): boolean
|
|
90
|
-
|
|
91
|
-
return n && (!(n & (n-1))) ? true: false;
|
|
89
|
+
function powerOfTwo(n: number): boolean {
|
|
90
|
+
return n && !(n & (n - 1)) ? true : false;
|
|
92
91
|
}
|
|
93
92
|
// check if enum is flaggable
|
|
94
93
|
function checkIsFlaggable(enums: EnumItem[]): boolean {
|
|
95
94
|
for (const e of enums) {
|
|
96
|
-
const value =
|
|
95
|
+
const value = +e.value;
|
|
97
96
|
if (isNaN(value)) {
|
|
98
97
|
continue; // skipping none number value
|
|
99
98
|
}
|
|
100
|
-
if (
|
|
99
|
+
if (value !== 0 && value !== 1 && !powerOfTwo(value)) {
|
|
101
100
|
return false;
|
|
102
101
|
}
|
|
103
102
|
}
|
|
104
103
|
return true;
|
|
105
104
|
}
|
|
106
105
|
|
|
106
|
+
export interface _TypescriptEnum {
|
|
107
|
+
[key: string | number]: number | string;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
export function adaptTypescriptEnum(map: _TypescriptEnum | string[]) {
|
|
111
|
+
if (Array.isArray(map)) {
|
|
112
|
+
let mm: _TypescriptEnum | null = null;
|
|
113
|
+
// create map as flaggable enum
|
|
114
|
+
mm = {};
|
|
115
|
+
for (let i = 0; i < map.length; i++) {
|
|
116
|
+
mm[map[i]] = 1 << i;
|
|
117
|
+
}
|
|
118
|
+
return mm;
|
|
119
|
+
}
|
|
120
|
+
return map as _TypescriptEnum;
|
|
121
|
+
}
|
|
122
|
+
|
|
107
123
|
/**
|
|
108
124
|
* @class Enum
|
|
109
125
|
* @constructor
|
|
@@ -111,28 +127,25 @@ function checkIsFlaggable(enums: EnumItem[]): boolean {
|
|
|
111
127
|
* @param {Array || Object} map This are the enum items.
|
|
112
128
|
*/
|
|
113
129
|
export class Enum {
|
|
114
|
-
|
|
115
130
|
private readonly enumItems: EnumItem[];
|
|
116
131
|
private readonly _isFlaggable: boolean;
|
|
117
132
|
|
|
118
|
-
constructor(map:
|
|
119
|
-
|
|
133
|
+
constructor(map: _TypescriptEnum | string[]) {
|
|
120
134
|
this.enumItems = [];
|
|
121
|
-
let mm:
|
|
135
|
+
let mm: _TypescriptEnum | null = null;
|
|
122
136
|
let isFlaggable = null;
|
|
123
137
|
if (Array.isArray(map)) {
|
|
124
|
-
|
|
125
|
-
mm = {};
|
|
126
|
-
for (let i = 0; i < map.length; i++) {
|
|
127
|
-
mm[map[i]] = 1 << i;
|
|
128
|
-
}
|
|
138
|
+
mm = adaptTypescriptEnum(map);
|
|
129
139
|
isFlaggable = true;
|
|
130
140
|
} else {
|
|
131
141
|
mm = map;
|
|
132
142
|
}
|
|
133
143
|
|
|
134
144
|
for (const key of Object.keys(mm)) {
|
|
135
|
-
|
|
145
|
+
if (typeof key !== "string") {
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
const val = mm[key] as number;
|
|
136
149
|
if (undefined === val) {
|
|
137
150
|
continue;
|
|
138
151
|
}
|
|
@@ -150,7 +163,7 @@ export class Enum {
|
|
|
150
163
|
}
|
|
151
164
|
this._isFlaggable = isFlaggable;
|
|
152
165
|
}
|
|
153
|
-
|
|
166
|
+
|
|
154
167
|
public get isFlaggable(): boolean {
|
|
155
168
|
return this._isFlaggable;
|
|
156
169
|
}
|
|
@@ -160,8 +173,7 @@ export class Enum {
|
|
|
160
173
|
* @param key The object to get with.
|
|
161
174
|
* @return the get result.
|
|
162
175
|
*/
|
|
163
|
-
public get(key: EnumItem | string | number):
|
|
164
|
-
|
|
176
|
+
public get(key: EnumItem | string | number): EnumItem | null {
|
|
165
177
|
const pThis = this as any;
|
|
166
178
|
if (key instanceof EnumItem) {
|
|
167
179
|
if (!pThis[key.key]) {
|
|
@@ -194,8 +206,7 @@ export class Enum {
|
|
|
194
206
|
return this.enumItems.join(" , ");
|
|
195
207
|
}
|
|
196
208
|
|
|
197
|
-
private _getByString(key: string):
|
|
198
|
-
|
|
209
|
+
private _getByString(key: string): EnumItem | null {
|
|
199
210
|
const pThis = this as any;
|
|
200
211
|
const parts = key.split(" | ");
|
|
201
212
|
|
|
@@ -221,8 +232,7 @@ export class Enum {
|
|
|
221
232
|
return kv;
|
|
222
233
|
}
|
|
223
234
|
|
|
224
|
-
private _getByNum(key: number):
|
|
225
|
-
|
|
235
|
+
private _getByNum(key: number): EnumItem | null {
|
|
226
236
|
if (key === 0) {
|
|
227
237
|
return null;
|
|
228
238
|
}
|
|
@@ -250,6 +260,4 @@ export class Enum {
|
|
|
250
260
|
pThis[key] = kv;
|
|
251
261
|
return kv;
|
|
252
262
|
}
|
|
253
|
-
|
|
254
|
-
|
|
255
263
|
}
|