@jotx-labs/core 2.2.1 → 2.4.130
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/README.md +2 -2
- package/dist/__tests__/events.test 2.d.ts +2 -0
- package/dist/__tests__/events.test 2.d.ts.map +1 -0
- package/dist/__tests__/events.test 2.js +63 -0
- package/dist/__tests__/events.test 2.js.map +1 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/parser/serializer.d.ts.map +1 -1
- package/dist/parser/serializer.js +19 -5
- package/dist/parser/serializer.js.map +1 -1
- package/dist/parser/tokenizer.new 2.d.ts +32 -0
- package/dist/parser/tokenizer.new 2.d.ts.map +1 -0
- package/dist/parser/tokenizer.new 2.js +195 -0
- package/dist/parser/tokenizer.new 2.js.map +1 -0
- package/dist/parser/tokenizer.new.d.ts +1 -0
- package/dist/parser/tokenizer.new.d.ts.map +1 -1
- package/dist/parser/tokenizer.new.js +19 -4
- package/dist/parser/tokenizer.new.js.map +1 -1
- package/dist/parser/v3/BlockParser.js +1 -1
- package/dist/parser/v3/BlockParser.js.map +1 -1
- package/dist/parser/v3/DocumentParser.d.ts.map +1 -1
- package/dist/parser/v3/DocumentParser.js +7 -0
- package/dist/parser/v3/DocumentParser.js.map +1 -1
- package/dist/parser/validator.js +1 -1
- package/dist/parser/validator.js.map +1 -1
- package/dist/platform/NullPlatformAdapter 2.d.ts +18 -0
- package/dist/platform/NullPlatformAdapter 2.d.ts.map +1 -0
- package/dist/platform/NullPlatformAdapter 2.js +41 -0
- package/dist/platform/NullPlatformAdapter 2.js.map +1 -0
- package/dist/platform/PlatformAdapter 2.d.ts +22 -0
- package/dist/platform/PlatformAdapter 2.d.ts.map +1 -0
- package/dist/platform/PlatformAdapter 2.js +7 -0
- package/dist/platform/PlatformAdapter 2.js.map +1 -0
- package/dist/platform/index 2.d.ts +3 -0
- package/dist/platform/index 2.d.ts.map +1 -0
- package/dist/platform/index 2.js +19 -0
- package/dist/platform/index 2.js.map +1 -0
- package/dist/plugin/PluginSystem 2.d.ts +46 -0
- package/dist/plugin/PluginSystem 2.d.ts.map +1 -0
- package/dist/plugin/PluginSystem 2.js +58 -0
- package/dist/plugin/PluginSystem 2.js.map +1 -0
- package/dist/plugin/index 2.d.ts +2 -0
- package/dist/plugin/index 2.d.ts.map +1 -0
- package/dist/plugin/index 2.js +18 -0
- package/dist/plugin/index 2.js.map +1 -0
- package/dist/types/ast.d.ts.map +1 -1
- package/dist/types/ast.js +48 -1
- package/dist/types/ast.js.map +1 -1
- package/dist/types/enums.d.ts +2 -2
- package/dist/types/enums.d.ts.map +1 -1
- package/dist/types/enums.js +9 -2
- package/dist/types/enums.js.map +1 -1
- package/dist/types/nodeManager 2.d.ts +86 -0
- package/dist/types/nodeManager 2.d.ts.map +1 -0
- package/dist/types/nodeManager 2.js +7 -0
- package/dist/types/nodeManager 2.js.map +1 -0
- package/dist/types/nodeManager.d.ts +86 -0
- package/dist/types/nodeManager.d.ts.map +1 -0
- package/dist/types/nodeManager.js +7 -0
- package/dist/types/nodeManager.js.map +1 -0
- package/dist/utils/idGenerator 2.d.ts +34 -0
- package/dist/utils/idGenerator 2.d.ts.map +1 -0
- package/dist/utils/idGenerator 2.js +105 -0
- package/dist/utils/idGenerator 2.js.map +1 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# @jotx/core
|
|
1
|
+
# @jotx-labs/core
|
|
2
2
|
|
|
3
3
|
Platform-agnostic core package for jotx note parsing and serialization.
|
|
4
4
|
|
|
@@ -12,7 +12,7 @@ npm test
|
|
|
12
12
|
## Usage
|
|
13
13
|
|
|
14
14
|
```typescript
|
|
15
|
-
import { Tokenizer } from '@jotx/core';
|
|
15
|
+
import { Tokenizer } from '@jotx-labs/core';
|
|
16
16
|
|
|
17
17
|
const tokenizer = new Tokenizer('hdef page MyNote');
|
|
18
18
|
const tokens = tokenizer.tokenize();
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"events.test 2.d.ts","sourceRoot":"","sources":["../../src/__tests__/events.test 2.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const events_1 = require("../events");
|
|
4
|
+
describe('EventEmitter', () => {
|
|
5
|
+
let emitter;
|
|
6
|
+
beforeEach(() => {
|
|
7
|
+
emitter = new events_1.EventEmitter();
|
|
8
|
+
});
|
|
9
|
+
it('should emit and receive events', () => {
|
|
10
|
+
const handler = jest.fn();
|
|
11
|
+
emitter.on('document:created', handler);
|
|
12
|
+
emitter.emit('document:created', { id: 'test' });
|
|
13
|
+
expect(handler).toHaveBeenCalledWith(expect.objectContaining({
|
|
14
|
+
type: 'document:created',
|
|
15
|
+
data: { id: 'test' }
|
|
16
|
+
}));
|
|
17
|
+
});
|
|
18
|
+
it('should remove event listener', () => {
|
|
19
|
+
const handler = jest.fn();
|
|
20
|
+
emitter.on('document:created', handler);
|
|
21
|
+
emitter.off('document:created', handler);
|
|
22
|
+
emitter.emit('document:created', { id: 'test' });
|
|
23
|
+
expect(handler).not.toHaveBeenCalled();
|
|
24
|
+
});
|
|
25
|
+
it('should handle once listeners', () => {
|
|
26
|
+
const handler = jest.fn();
|
|
27
|
+
emitter.once('document:created', handler);
|
|
28
|
+
emitter.emit('document:created', { id: 'test1' });
|
|
29
|
+
emitter.emit('document:created', { id: 'test2' });
|
|
30
|
+
expect(handler).toHaveBeenCalledTimes(1);
|
|
31
|
+
});
|
|
32
|
+
it('should support multiple listeners', () => {
|
|
33
|
+
const handler1 = jest.fn();
|
|
34
|
+
const handler2 = jest.fn();
|
|
35
|
+
emitter.on('document:created', handler1);
|
|
36
|
+
emitter.on('document:created', handler2);
|
|
37
|
+
emitter.emit('document:created', { id: 'test' });
|
|
38
|
+
expect(handler1).toHaveBeenCalled();
|
|
39
|
+
expect(handler2).toHaveBeenCalled();
|
|
40
|
+
});
|
|
41
|
+
it('should remove all listeners for event', () => {
|
|
42
|
+
const handler1 = jest.fn();
|
|
43
|
+
const handler2 = jest.fn();
|
|
44
|
+
emitter.on('document:created', handler1);
|
|
45
|
+
emitter.on('document:created', handler2);
|
|
46
|
+
emitter.removeAllListeners('document:created');
|
|
47
|
+
emitter.emit('document:created', { id: 'test' });
|
|
48
|
+
expect(handler1).not.toHaveBeenCalled();
|
|
49
|
+
expect(handler2).not.toHaveBeenCalled();
|
|
50
|
+
});
|
|
51
|
+
it('should remove all listeners for all events', () => {
|
|
52
|
+
const handler1 = jest.fn();
|
|
53
|
+
const handler2 = jest.fn();
|
|
54
|
+
emitter.on('document:created', handler1);
|
|
55
|
+
emitter.on('block:created', handler2);
|
|
56
|
+
emitter.removeAllListeners();
|
|
57
|
+
emitter.emit('document:created', { id: 'test' });
|
|
58
|
+
emitter.emit('block:created', { id: 'test' });
|
|
59
|
+
expect(handler1).not.toHaveBeenCalled();
|
|
60
|
+
expect(handler2).not.toHaveBeenCalled();
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
//# sourceMappingURL=events.test%202.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"events.test 2.js","sourceRoot":"","sources":["../../src/__tests__/events.test 2.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* jotx 2.0 Core - Pure functional parser and validator
|
|
3
|
-
* @module @jotx/core
|
|
3
|
+
* @module @jotx-labs/core
|
|
4
4
|
*
|
|
5
5
|
* Zero dependencies, works everywhere (Node, Browser, Mobile)
|
|
6
6
|
* Pure functions only: parse, serialize, validate
|
|
7
7
|
*/
|
|
8
8
|
export * from './types/enums';
|
|
9
9
|
export * from './types/ast';
|
|
10
|
+
export * from './types/nodeManager';
|
|
10
11
|
import { Tokenizer } from './parser/tokenizer.new';
|
|
11
12
|
import { Parser } from './parser/v3/Parser';
|
|
12
13
|
import { Serializer } from './parser/serializer';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,qBAAqB,CAAA;AAKnC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAE/D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,CAAA;AAKpE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAA;AAK7E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE1H;;;GAGG;AACH,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,6BAGjC;AAMD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,UAGjC;AAMD;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,2CAGhC;AAMD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM;;;;EAS5C;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAG9C;AACD,cAAc,YAAY,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/**
|
|
3
3
|
* jotx 2.0 Core - Pure functional parser and validator
|
|
4
|
-
* @module @jotx/core
|
|
4
|
+
* @module @jotx-labs/core
|
|
5
5
|
*
|
|
6
6
|
* Zero dependencies, works everywhere (Node, Browser, Mobile)
|
|
7
7
|
* Pure functions only: parse, serialize, validate
|
|
@@ -27,11 +27,11 @@ exports.serialize = serialize;
|
|
|
27
27
|
exports.validate = validate;
|
|
28
28
|
exports.parseAndValidate = parseAndValidate;
|
|
29
29
|
exports.roundTrip = roundTrip;
|
|
30
|
-
// ============================================================================
|
|
31
30
|
// TYPES - Data structures only
|
|
32
31
|
// ============================================================================
|
|
33
32
|
__exportStar(require("./types/enums"), exports);
|
|
34
33
|
__exportStar(require("./types/ast"), exports);
|
|
34
|
+
__exportStar(require("./types/nodeManager"), exports);
|
|
35
35
|
// ============================================================================
|
|
36
36
|
// PARSER - Text → AST
|
|
37
37
|
// ============================================================================
|
|
@@ -114,5 +114,5 @@ function roundTrip(text) {
|
|
|
114
114
|
return serialize(ast);
|
|
115
115
|
}
|
|
116
116
|
__exportStar(require("./platform"), exports);
|
|
117
|
-
// V2 blocks removed - use @jotx/standard-lib instead
|
|
117
|
+
// V2 blocks removed - use @jotx-labs/standard-lib instead
|
|
118
118
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;AAgCH,sBAGC;AAUD,8BAGC;AAUD,4BAGC;AAUD,4CASC;AAMD,8BAGC;AAvFD,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;AAgCH,sBAGC;AAUD,8BAGC;AAUD,4BAGC;AAUD,4CASC;AAMD,8BAGC;AAvFD,+BAA+B;AAC/B,+EAA+E;AAC/E,gDAA6B;AAC7B,8CAA2B;AAC3B,sDAAmC;AAEnC,+EAA+E;AAC/E,sBAAsB;AACtB,+EAA+E;AAC/E,0DAAkD;AAKzC,0FALA,yBAAS,OAKA;AAJlB,+CAA2C;AAIvB,uFAJX,eAAM,OAIW;AAH1B,oDAAgD;AAGpB,2FAHnB,uBAAU,OAGmB;AAFtC,kDAA+D;AAEvB,0FAF/B,qBAAS,OAE+B;AAAE,gGAF/B,2BAAe,OAE+B;AAElE,+EAA+E;AAC/E,+BAA+B;AAC/B,+EAA+E;AAC/E,oEAA6E;AAApE,kHAAA,aAAa,OAAA;AAAE,kHAAA,aAAa,OAAA;AAErC,+EAA+E;AAC/E,4BAA4B;AAC5B,+EAA+E;AAC/E,mDAA0H;AAAjH,8GAAA,eAAe,OAAA;AAAE,+GAAA,gBAAgB,OAAA;AAAE,6GAAA,cAAc,OAAA;AAAE,0GAAA,WAAW,OAAA;AAAE,mHAAA,oBAAoB,OAAA;AAE7F;;;GAGG;AACH,SAAgB,KAAK,CAAC,IAAY;IAChC,MAAM,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAC3B,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AAC3B,CAAC;AAED,+EAA+E;AAC/E,0BAA0B;AAC1B,+EAA+E;AAE/E;;;GAGG;AACH,SAAgB,SAAS,CAAC,GAAQ;IAChC,MAAM,UAAU,GAAG,IAAI,uBAAU,EAAE,CAAA;IACnC,OAAO,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;AAClC,CAAC;AAED,+EAA+E;AAC/E,2BAA2B;AAC3B,+EAA+E;AAE/E;;;GAGG;AACH,SAAgB,QAAQ,CAAC,GAAQ;IAC/B,MAAM,SAAS,GAAG,IAAA,2BAAe,GAAE,CAAA;IACnC,OAAO,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AAChC,CAAC;AAED,+EAA+E;AAC/E,wBAAwB;AACxB,+EAA+E;AAE/E;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;IAE5B,OAAO;QACL,GAAG;QACH,OAAO,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;QAC5B,MAAM;KACP,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,SAAS,CAAC,IAAY;IACpC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;IACvB,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC;AACD,6CAA0B;AAC1B,0DAA0D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../src/parser/serializer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,GAAG,EAA2B,MAAM,cAAc,CAAA;AAE3D,qBAAa,UAAU;IACrB;;OAEG;IACH,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAuB3B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAI/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA8BzB;;OAEG;IACH,OAAO,CAAC,UAAU;IAIlB;;OAEG;IACH,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../src/parser/serializer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,GAAG,EAA2B,MAAM,cAAc,CAAA;AAE3D,qBAAa,UAAU;IACrB;;OAEG;IACH,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAuB3B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAI/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IA8BzB;;OAEG;IACH,OAAO,CAAC,UAAU;IAIlB;;OAEG;IACH,OAAO,CAAC,cAAc;CA+FvB"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.Serializer = void 0;
|
|
8
|
-
const registry_1 = require("@jotx/registry");
|
|
8
|
+
const registry_1 = require("@jotx-labs/registry");
|
|
9
9
|
class Serializer {
|
|
10
10
|
/**
|
|
11
11
|
* Serialize AST to jotx text
|
|
@@ -82,6 +82,10 @@ class Serializer {
|
|
|
82
82
|
const indent = ' '.repeat(indentLevel);
|
|
83
83
|
// Get block definition from registry
|
|
84
84
|
const def = registry_1.registry.get(block.type);
|
|
85
|
+
// DEBUG: Log if definition missing
|
|
86
|
+
if (!def) {
|
|
87
|
+
console.log(`[Serializer] WARNING: No definition found for type '${block.type}'. Registry has ${registry_1.registry.getAll().length} blocks:`, registry_1.registry.getAll().map(b => b.type).join(', '));
|
|
88
|
+
}
|
|
85
89
|
// Use keyword from registry (e.g., 'heading' not 'heading')
|
|
86
90
|
// If no definition found, use the type as-is (lowercased)
|
|
87
91
|
const keyword = def?.syntax.keyword || block.type.toLowerCase();
|
|
@@ -94,11 +98,21 @@ class Serializer {
|
|
|
94
98
|
continue;
|
|
95
99
|
// Convert to flatcase (camelCase -> flatcase)
|
|
96
100
|
const outKey = this.toFlatcase(key);
|
|
97
|
-
let
|
|
98
|
-
if (def && def.schema.properties[key]
|
|
99
|
-
|
|
101
|
+
let isUnquoted = false;
|
|
102
|
+
if (def && def.schema.properties[key]) {
|
|
103
|
+
const propType = def.schema.properties[key].type;
|
|
104
|
+
// Enum and identifier types should be unquoted
|
|
105
|
+
isUnquoted = propType === 'enum' || propType === 'identifier';
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
// Fallback: Known identifier properties that should never be quoted
|
|
109
|
+
// This handles cases where registry might not be loaded
|
|
110
|
+
const KNOWN_IDENTIFIERS = ['refid', 'reftype', 'variant', 'charttype', 'level'];
|
|
111
|
+
if (KNOWN_IDENTIFIERS.includes(key.toLowerCase())) {
|
|
112
|
+
isUnquoted = true;
|
|
113
|
+
}
|
|
100
114
|
}
|
|
101
|
-
if (typeof value === 'string' && !
|
|
115
|
+
if (typeof value === 'string' && !isUnquoted) {
|
|
102
116
|
// Check if multiline
|
|
103
117
|
if (value.includes('\n')) {
|
|
104
118
|
// Check for nested triple quotes and determine strict delimiter
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../src/parser/serializer.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../src/parser/serializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tokenizer (Lexer) for jotx 3.0
|
|
3
|
+
* Converts raw string into strict tokens for the parser
|
|
4
|
+
*/
|
|
5
|
+
export declare enum TokenType {
|
|
6
|
+
HEADER_DEF = "HEADER_DEF",// hdef <type> <id>
|
|
7
|
+
BLOCK_START = "BLOCK_START",// def heading1 id
|
|
8
|
+
INDENT = "INDENT",// " " (2 spaces)
|
|
9
|
+
DEDENT = "DEDENT",// Return to previous indent
|
|
10
|
+
PROPERTY = "PROPERTY",// key "value"
|
|
11
|
+
REF_KEYWORD = "REF_KEYWORD",// ref <type> <id> (for jotxlink)
|
|
12
|
+
TEXT_START = "TEXT_START",// text """
|
|
13
|
+
TEXT_CONTENT = "TEXT_CONTENT",// ... content ...
|
|
14
|
+
TEXT_END = "TEXT_END",// """
|
|
15
|
+
COMMENT = "COMMENT",// # comment
|
|
16
|
+
NEWLINE = "NEWLINE"
|
|
17
|
+
}
|
|
18
|
+
export interface Token {
|
|
19
|
+
type: TokenType;
|
|
20
|
+
value?: string;
|
|
21
|
+
params?: string[];
|
|
22
|
+
line: number;
|
|
23
|
+
}
|
|
24
|
+
export declare class Tokenizer {
|
|
25
|
+
private tokens;
|
|
26
|
+
private indentStack;
|
|
27
|
+
private currentLine;
|
|
28
|
+
private inMultilineText;
|
|
29
|
+
private currentMultilineDelimiter;
|
|
30
|
+
tokenize(input: string): Token[];
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=tokenizer.new%202.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tokenizer.new 2.d.ts","sourceRoot":"","sources":["../../src/parser/tokenizer.new 2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,oBAAY,SAAS;IACnB,UAAU,eAAe,CAAI,mBAAmB;IAChD,WAAW,gBAAgB,CAAE,kBAAkB;IAC/C,MAAM,WAAW,CAAY,kBAAkB;IAC/C,MAAM,WAAW,CAAY,4BAA4B;IACzD,QAAQ,aAAa,CAAQ,cAAc;IAC3C,WAAW,gBAAgB,CAAE,iCAAiC;IAC9D,UAAU,eAAe,CAAI,WAAW;IACxC,YAAY,iBAAiB,CAAE,kBAAkB;IACjD,QAAQ,aAAa,CAAQ,MAAM;IACnC,OAAO,YAAY,CAAU,YAAY;IACzC,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,WAAW,CAAa;IAGhC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,yBAAyB,CAAiB;IAElD,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE;CAsLjC"}
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Tokenizer (Lexer) for jotx 3.0
|
|
4
|
+
* Converts raw string into strict tokens for the parser
|
|
5
|
+
*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.Tokenizer = exports.TokenType = void 0;
|
|
8
|
+
var TokenType;
|
|
9
|
+
(function (TokenType) {
|
|
10
|
+
TokenType["HEADER_DEF"] = "HEADER_DEF";
|
|
11
|
+
TokenType["BLOCK_START"] = "BLOCK_START";
|
|
12
|
+
TokenType["INDENT"] = "INDENT";
|
|
13
|
+
TokenType["DEDENT"] = "DEDENT";
|
|
14
|
+
TokenType["PROPERTY"] = "PROPERTY";
|
|
15
|
+
TokenType["REF_KEYWORD"] = "REF_KEYWORD";
|
|
16
|
+
TokenType["TEXT_START"] = "TEXT_START";
|
|
17
|
+
TokenType["TEXT_CONTENT"] = "TEXT_CONTENT";
|
|
18
|
+
TokenType["TEXT_END"] = "TEXT_END";
|
|
19
|
+
TokenType["COMMENT"] = "COMMENT";
|
|
20
|
+
TokenType["NEWLINE"] = "NEWLINE"; // Empty line
|
|
21
|
+
})(TokenType || (exports.TokenType = TokenType = {}));
|
|
22
|
+
class Tokenizer {
|
|
23
|
+
constructor() {
|
|
24
|
+
this.tokens = [];
|
|
25
|
+
this.indentStack = [0]; // Tack indentation levels (spaces)
|
|
26
|
+
this.currentLine = 0;
|
|
27
|
+
// State for multiline text
|
|
28
|
+
this.inMultilineText = false;
|
|
29
|
+
this.currentMultilineDelimiter = '"""'; // Default, but will be overwritten
|
|
30
|
+
}
|
|
31
|
+
tokenize(input) {
|
|
32
|
+
this.tokens = [];
|
|
33
|
+
this.indentStack = [0];
|
|
34
|
+
this.currentLine = 0;
|
|
35
|
+
this.inMultilineText = false;
|
|
36
|
+
const lines = input.split('\n');
|
|
37
|
+
for (let i = 0; i < lines.length; i++) {
|
|
38
|
+
this.currentLine = i + 1;
|
|
39
|
+
const rawLine = lines[i];
|
|
40
|
+
// 1. Handle Multiline Text Mode
|
|
41
|
+
if (this.inMultilineText) {
|
|
42
|
+
const trimmedRight = rawLine.trimEnd();
|
|
43
|
+
if (rawLine.trim() === this.currentMultilineDelimiter) {
|
|
44
|
+
// Standard closing on own line
|
|
45
|
+
this.tokens.push({ type: TokenType.TEXT_END, line: this.currentLine });
|
|
46
|
+
this.inMultilineText = false;
|
|
47
|
+
}
|
|
48
|
+
else if (trimmedRight.endsWith(this.currentMultilineDelimiter)) {
|
|
49
|
+
// Content + delimiter on same line
|
|
50
|
+
// Preserve indentation/whitespace on left, strip delimiter from right
|
|
51
|
+
const content = trimmedRight.slice(0, -this.currentMultilineDelimiter.length);
|
|
52
|
+
this.tokens.push({ type: TokenType.TEXT_CONTENT, value: content, line: this.currentLine });
|
|
53
|
+
this.tokens.push({ type: TokenType.TEXT_END, line: this.currentLine });
|
|
54
|
+
this.inMultilineText = false;
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
// Just content
|
|
58
|
+
this.tokens.push({ type: TokenType.TEXT_CONTENT, value: rawLine, line: this.currentLine });
|
|
59
|
+
}
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
// 2. Skip empty lines (but maybe meaningful for block separation?)
|
|
63
|
+
// For now, ignore purely empty lines
|
|
64
|
+
if (!rawLine.trim()) {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
// 3. Handle Indentation
|
|
68
|
+
const indent = rawLine.search(/\S/);
|
|
69
|
+
if (indent === -1)
|
|
70
|
+
continue; // Should be handled by empty check, but safety
|
|
71
|
+
const currentIndent = this.indentStack[this.indentStack.length - 1];
|
|
72
|
+
if (indent > currentIndent) {
|
|
73
|
+
this.indentStack.push(indent);
|
|
74
|
+
this.tokens.push({ type: TokenType.INDENT, line: this.currentLine });
|
|
75
|
+
}
|
|
76
|
+
else if (indent < currentIndent) {
|
|
77
|
+
while (this.indentStack.length > 1 && this.indentStack[this.indentStack.length - 1] > indent) {
|
|
78
|
+
this.indentStack.pop();
|
|
79
|
+
this.tokens.push({ type: TokenType.DEDENT, line: this.currentLine });
|
|
80
|
+
}
|
|
81
|
+
if (this.indentStack[this.indentStack.length - 1] !== indent) {
|
|
82
|
+
throw new Error(`Line ${this.currentLine}: Invalid indentation level`);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
const trimmed = rawLine.trim();
|
|
86
|
+
// 4. Tokenize Line Content
|
|
87
|
+
// Header Definition: hdef <type> <id>
|
|
88
|
+
if (trimmed.startsWith('hdef ')) {
|
|
89
|
+
const parts = trimmed.substring(5).split(/\s+/); // Remove "hdef " and split
|
|
90
|
+
this.tokens.push({
|
|
91
|
+
type: TokenType.HEADER_DEF,
|
|
92
|
+
params: parts, // [docType, docId]
|
|
93
|
+
line: this.currentLine
|
|
94
|
+
});
|
|
95
|
+
continue;
|
|
96
|
+
}
|
|
97
|
+
// Block Start: def <type> <id>
|
|
98
|
+
if (trimmed.startsWith('def ')) {
|
|
99
|
+
const parts = trimmed.substring(4).split(/\s+/); // Remove "def " and split
|
|
100
|
+
if (parts.length < 2) {
|
|
101
|
+
// Allow optional ID? For parsing simplicity let's require it for now,
|
|
102
|
+
// or auto-gen it in parser if missing.
|
|
103
|
+
// Pattern: def video my_video_1
|
|
104
|
+
}
|
|
105
|
+
this.tokens.push({
|
|
106
|
+
type: TokenType.BLOCK_START,
|
|
107
|
+
params: parts,
|
|
108
|
+
line: this.currentLine
|
|
109
|
+
});
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
// Multiline Text Start: text """ or text """"
|
|
113
|
+
// Regex to capture key and the opening delimiter (3 or more quotes), allowing optional content after
|
|
114
|
+
const multiLineMatch = trimmed.match(/^([a-zA-Z_]+)\s+("{3,})(.*)$/);
|
|
115
|
+
if (multiLineMatch) {
|
|
116
|
+
const key = multiLineMatch[1];
|
|
117
|
+
const delimiter = multiLineMatch[2];
|
|
118
|
+
const initialContent = multiLineMatch[3];
|
|
119
|
+
this.tokens.push({ type: TokenType.TEXT_START, value: key, line: this.currentLine });
|
|
120
|
+
// Store the specific delimiter
|
|
121
|
+
this.currentMultilineDelimiter = delimiter;
|
|
122
|
+
// Check if it's a one-liner: key """value"""
|
|
123
|
+
if (initialContent && initialContent.trimEnd().endsWith(delimiter)) {
|
|
124
|
+
const content = initialContent.trimEnd().slice(0, -delimiter.length);
|
|
125
|
+
if (content) {
|
|
126
|
+
this.tokens.push({ type: TokenType.TEXT_CONTENT, value: content, line: this.currentLine });
|
|
127
|
+
}
|
|
128
|
+
this.tokens.push({ type: TokenType.TEXT_END, line: this.currentLine });
|
|
129
|
+
this.inMultilineText = false;
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
// Multiline mode
|
|
133
|
+
this.inMultilineText = true;
|
|
134
|
+
// If there's content immediately after the delimiter, add it
|
|
135
|
+
if (initialContent) {
|
|
136
|
+
this.tokens.push({ type: TokenType.TEXT_CONTENT, value: initialContent, line: this.currentLine });
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
// Property: key "value" or key 123 or key true
|
|
142
|
+
// Ref Keyword: ref <type> <id> (for jotxlink)
|
|
143
|
+
if (trimmed.startsWith('ref ')) {
|
|
144
|
+
const parts = trimmed.substring(4).split(/\s+/);
|
|
145
|
+
if (parts.length !== 2) {
|
|
146
|
+
throw new Error(`Line ${this.currentLine}: ref keyword requires exactly 2 arguments: ref <type> <id>`);
|
|
147
|
+
}
|
|
148
|
+
this.tokens.push({
|
|
149
|
+
type: TokenType.REF_KEYWORD,
|
|
150
|
+
params: parts,
|
|
151
|
+
line: this.currentLine
|
|
152
|
+
});
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
155
|
+
// Regex: ^key "value"$ or ^key 123$
|
|
156
|
+
// Simple property parser
|
|
157
|
+
// Property: key "value" or key 123
|
|
158
|
+
const propMatch = trimmed.match(/^([a-zA-Z_]+)\s+(.+)$/);
|
|
159
|
+
if (propMatch) {
|
|
160
|
+
const key = propMatch[1];
|
|
161
|
+
let value = propMatch[2];
|
|
162
|
+
// Strip inline comments if present
|
|
163
|
+
const commentIdx = value.indexOf('#');
|
|
164
|
+
if (commentIdx !== -1) {
|
|
165
|
+
value = value.substring(0, commentIdx).trim();
|
|
166
|
+
}
|
|
167
|
+
// Strip quotes if string
|
|
168
|
+
if (value.startsWith('"') && value.endsWith('"')) {
|
|
169
|
+
value = value.substring(1, value.length - 1);
|
|
170
|
+
}
|
|
171
|
+
this.tokens.push({
|
|
172
|
+
type: TokenType.PROPERTY,
|
|
173
|
+
value: key,
|
|
174
|
+
params: [value],
|
|
175
|
+
line: this.currentLine
|
|
176
|
+
});
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
// Fallback/Comment
|
|
180
|
+
if (trimmed.startsWith('#')) {
|
|
181
|
+
this.tokens.push({ type: TokenType.COMMENT, value: trimmed, line: this.currentLine });
|
|
182
|
+
continue;
|
|
183
|
+
}
|
|
184
|
+
throw new Error(`Line ${this.currentLine}: Syntax error: ${trimmed}`);
|
|
185
|
+
}
|
|
186
|
+
// Close remaining indentation
|
|
187
|
+
while (this.indentStack.length > 1) {
|
|
188
|
+
this.indentStack.pop();
|
|
189
|
+
this.tokens.push({ type: TokenType.DEDENT, line: this.currentLine });
|
|
190
|
+
}
|
|
191
|
+
return this.tokens;
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
exports.Tokenizer = Tokenizer;
|
|
195
|
+
//# sourceMappingURL=tokenizer.new%202.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tokenizer.new 2.js","sourceRoot":"","sources":["../../src/parser/tokenizer.new 2.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare enum TokenType {
|
|
|
8
8
|
INDENT = "INDENT",// " " (2 spaces)
|
|
9
9
|
DEDENT = "DEDENT",// Return to previous indent
|
|
10
10
|
PROPERTY = "PROPERTY",// key "value"
|
|
11
|
+
REF_KEYWORD = "REF_KEYWORD",// ref <type> <id> (for jotxlink)
|
|
11
12
|
TEXT_START = "TEXT_START",// text """
|
|
12
13
|
TEXT_CONTENT = "TEXT_CONTENT",// ... content ...
|
|
13
14
|
TEXT_END = "TEXT_END",// """
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenizer.new.d.ts","sourceRoot":"","sources":["../../src/parser/tokenizer.new.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,oBAAY,SAAS;IACnB,UAAU,eAAe,CAAI,mBAAmB;IAChD,WAAW,gBAAgB,CAAE,kBAAkB;IAC/C,MAAM,WAAW,CAAY,kBAAkB;IAC/C,MAAM,WAAW,CAAY,4BAA4B;IACzD,QAAQ,aAAa,CAAQ,cAAc;IAC3C,UAAU,eAAe,CAAI,WAAW;IACxC,YAAY,iBAAiB,CAAE,kBAAkB;IACjD,QAAQ,aAAa,CAAQ,MAAM;IACnC,OAAO,YAAY,CAAU,YAAY;IACzC,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,WAAW,CAAa;IAGhC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,yBAAyB,CAAiB;IAElD,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"tokenizer.new.d.ts","sourceRoot":"","sources":["../../src/parser/tokenizer.new.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,oBAAY,SAAS;IACnB,UAAU,eAAe,CAAI,mBAAmB;IAChD,WAAW,gBAAgB,CAAE,kBAAkB;IAC/C,MAAM,WAAW,CAAY,kBAAkB;IAC/C,MAAM,WAAW,CAAY,4BAA4B;IACzD,QAAQ,aAAa,CAAQ,cAAc;IAC3C,WAAW,gBAAgB,CAAE,iCAAiC;IAC9D,UAAU,eAAe,CAAI,WAAW;IACxC,YAAY,iBAAiB,CAAE,kBAAkB;IACjD,QAAQ,aAAa,CAAQ,MAAM;IACnC,OAAO,YAAY,CAAU,YAAY;IACzC,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,WAAW,CAAa;IAGhC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,yBAAyB,CAAiB;IAElD,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE;CAuLjC"}
|
|
@@ -12,6 +12,7 @@ var TokenType;
|
|
|
12
12
|
TokenType["INDENT"] = "INDENT";
|
|
13
13
|
TokenType["DEDENT"] = "DEDENT";
|
|
14
14
|
TokenType["PROPERTY"] = "PROPERTY";
|
|
15
|
+
TokenType["REF_KEYWORD"] = "REF_KEYWORD";
|
|
15
16
|
TokenType["TEXT_START"] = "TEXT_START";
|
|
16
17
|
TokenType["TEXT_CONTENT"] = "TEXT_CONTENT";
|
|
17
18
|
TokenType["TEXT_END"] = "TEXT_END";
|
|
@@ -138,6 +139,19 @@ class Tokenizer {
|
|
|
138
139
|
continue;
|
|
139
140
|
}
|
|
140
141
|
// Property: key "value" or key 123 or key true
|
|
142
|
+
// Ref Keyword: ref <type> <id> (for jotxlink)
|
|
143
|
+
if (trimmed.startsWith('ref ')) {
|
|
144
|
+
const parts = trimmed.substring(4).split(/\s+/);
|
|
145
|
+
if (parts.length !== 2) {
|
|
146
|
+
throw new Error(`Line ${this.currentLine}: ref keyword requires exactly 2 arguments: ref <type> <id>`);
|
|
147
|
+
}
|
|
148
|
+
this.tokens.push({
|
|
149
|
+
type: TokenType.REF_KEYWORD,
|
|
150
|
+
params: parts,
|
|
151
|
+
line: this.currentLine
|
|
152
|
+
});
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
141
155
|
// Regex: ^key "value"$ or ^key 123$
|
|
142
156
|
// Simple property parser
|
|
143
157
|
// Property: key "value" or key 123
|
|
@@ -145,10 +159,11 @@ class Tokenizer {
|
|
|
145
159
|
if (propMatch) {
|
|
146
160
|
const key = propMatch[1];
|
|
147
161
|
let value = propMatch[2];
|
|
148
|
-
// Strip inline comments if present
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
162
|
+
// Strip inline comments if present (only if # is preceded by whitespace)
|
|
163
|
+
// This preserves # in identifiers like "DocID#blockId"
|
|
164
|
+
const commentMatch = value.match(/\s+#/);
|
|
165
|
+
if (commentMatch) {
|
|
166
|
+
value = value.substring(0, commentMatch.index).trim();
|
|
152
167
|
}
|
|
153
168
|
// Strip quotes if string
|
|
154
169
|
if (value.startsWith('"') && value.endsWith('"')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenizer.new.js","sourceRoot":"","sources":["../../src/parser/tokenizer.new.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,IAAY,
|
|
1
|
+
{"version":3,"file":"tokenizer.new.js","sourceRoot":"","sources":["../../src/parser/tokenizer.new.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BlockParser = void 0;
|
|
4
4
|
const tokenizer_new_1 = require("../tokenizer.new");
|
|
5
|
-
const registry_1 = require("@jotx/registry");
|
|
5
|
+
const registry_1 = require("@jotx-labs/registry");
|
|
6
6
|
class BlockParser {
|
|
7
7
|
// Returns the parsed block and the next token index
|
|
8
8
|
parseBlock(tokens, startIndex, parentStack) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockParser.js","sourceRoot":"","sources":["../../../src/parser/v3/BlockParser.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"BlockParser.js","sourceRoot":"","sources":["../../../src/parser/v3/BlockParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../../src/parser/v3/DocumentParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAa,MAAM,iBAAiB,CAAC;AAG1D,qBAAa,cAAc;IACvB,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAY;;IAO7B,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;
|
|
1
|
+
{"version":3,"file":"DocumentParser.d.ts","sourceRoot":"","sources":["../../../src/parser/v3/DocumentParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAa,MAAM,iBAAiB,CAAC;AAG1D,qBAAa,cAAc;IACvB,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,SAAS,CAAY;;IAO7B,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;CAuHrC"}
|
|
@@ -80,6 +80,13 @@ class DocumentParser {
|
|
|
80
80
|
this.blockParser.parseProperty(currentBlock, token.value, token.params[0]);
|
|
81
81
|
}
|
|
82
82
|
break;
|
|
83
|
+
case tokenizer_new_1.TokenType.REF_KEYWORD:
|
|
84
|
+
// ref <type> <id> (for jotxlink blocks)
|
|
85
|
+
if (currentBlock && token.params && token.params.length === 2) {
|
|
86
|
+
currentBlock.properties.refType = token.params[0];
|
|
87
|
+
currentBlock.properties.refId = token.params[1];
|
|
88
|
+
}
|
|
89
|
+
break;
|
|
83
90
|
case tokenizer_new_1.TokenType.TEXT_START:
|
|
84
91
|
if (currentBlock && token.value) {
|
|
85
92
|
currentPropKey = token.value;
|