Skip to content

Commit 45d19b3

Browse files
authored
Merge pull request #151 from ducflair/jorgedanisc
Jorgedanisc
2 parents 2565027 + a0058b7 commit 45d19b3

38 files changed

Lines changed: 1040 additions & 638 deletions

.documentation/SchemaUpdates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
these are the files you must change from the duc repo of the @scopture-monolith/scopture-monolith.code-workspace :
1+
these are the files you must change from the duc repo:
22

33
on the typescript side:
44
@duc/packages/ducjs/src/types/index.ts

Cargo.lock

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"packageManager": "bun@1.1.24",
5050
"private": true,
5151
"scripts": {
52+
"build": "turbo build",
5253
"flatc:gen": "bun run flatc:gen:duc",
5354
"flatc:gen:duc": "cd schema && bash flatc-duc-generate.sh",
5455
"clean": "bun del-cli \"**/dist\" \".turbo\" \"**/node_modules\" \"**/package-lock.json\" \"**/tsconfig.tsbuildinfo\" \"**/tsconfig.node.tsbuildinfo\" \"**/vite.config.js\"",

packages/ducjs/scripts/build.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,13 @@ function main() {
3333

3434
// Clean previous build artifacts
3535
const distDir = path.join(manifestDir, '..', 'dist');
36-
const tsbuildinfo = path.join(manifestDir, '..', 'tsconfig.tsbuildinfo');
3736

3837
try {
3938
fs.rmSync(distDir, { recursive: true, force: true });
4039
} catch (error) {
4140
console.log('No dist directory to clean or error:', error.message);
4241
}
4342

44-
try {
45-
fs.unlinkSync(tsbuildinfo);
46-
} catch (error) {
47-
console.log('No tsconfig.tsbuildinfo to remove or error:', error.message);
48-
}
49-
5043
// Set environment variable and run TypeScript compiler
5144
const env = { ...process.env, DUC_SCHEMA_VERSION: version };
5245

packages/ducjs/src/flatbuffers/duc.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ export { DucBlock } from './duc/duc-block';
4040
export { DucBlockAttributeDefinition } from './duc/duc-block-attribute-definition';
4141
export { DucBlockAttributeDefinitionEntry } from './duc/duc-block-attribute-definition-entry';
4242
export { DucBlockDuplicationArray } from './duc/duc-block-duplication-array';
43+
export { DucBlockInstance } from './duc/duc-block-instance';
4344
export { DucBlockInstanceElement } from './duc/duc-block-instance-element';
4445
export { DucCommonStyle } from './duc/duc-common-style';
4546
export { DucDimensionElement } from './duc/duc-dimension-element';

packages/ducjs/src/flatbuffers/duc/duc-block-instance-element.ts

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
import * as flatbuffers from 'flatbuffers';
66

7-
import { DucBlockDuplicationArray } from '../duc/duc-block-duplication-array';
8-
import { StringValueEntry } from '../duc/string-value-entry';
9-
import { _DucElementBase } from '../duc/duc-element-base';
10-
11-
127
export class DucBlockInstanceElement {
138
bb: flatbuffers.ByteBuffer|null = null;
149
bb_pos = 0;
@@ -27,91 +22,10 @@ static getSizePrefixedRootAsDucBlockInstanceElement(bb:flatbuffers.ByteBuffer, o
2722
return (obj || new DucBlockInstanceElement()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
2823
}
2924

30-
base(obj?:_DucElementBase):_DucElementBase|null {
31-
const offset = this.bb!.__offset(this.bb_pos, 4);
32-
return offset ? (obj || new _DucElementBase()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
33-
}
34-
35-
blockId():string|null
36-
blockId(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
37-
blockId(optionalEncoding?:any):string|Uint8Array|null {
38-
const offset = this.bb!.__offset(this.bb_pos, 6);
39-
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
40-
}
41-
42-
elementOverrides(index: number, obj?:StringValueEntry):StringValueEntry|null {
43-
const offset = this.bb!.__offset(this.bb_pos, 8);
44-
return offset ? (obj || new StringValueEntry()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
45-
}
46-
47-
elementOverridesLength():number {
48-
const offset = this.bb!.__offset(this.bb_pos, 8);
49-
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
50-
}
51-
52-
attributeValues(index: number, obj?:StringValueEntry):StringValueEntry|null {
53-
const offset = this.bb!.__offset(this.bb_pos, 10);
54-
return offset ? (obj || new StringValueEntry()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
55-
}
56-
57-
attributeValuesLength():number {
58-
const offset = this.bb!.__offset(this.bb_pos, 10);
59-
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
60-
}
61-
62-
duplicationArray(obj?:DucBlockDuplicationArray):DucBlockDuplicationArray|null {
63-
const offset = this.bb!.__offset(this.bb_pos, 12);
64-
return offset ? (obj || new DucBlockDuplicationArray()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
65-
}
66-
6725
static startDucBlockInstanceElement(builder:flatbuffers.Builder) {
6826
builder.startObject(5);
6927
}
7028

71-
static addBase(builder:flatbuffers.Builder, baseOffset:flatbuffers.Offset) {
72-
builder.addFieldOffset(0, baseOffset, 0);
73-
}
74-
75-
static addBlockId(builder:flatbuffers.Builder, blockIdOffset:flatbuffers.Offset) {
76-
builder.addFieldOffset(1, blockIdOffset, 0);
77-
}
78-
79-
static addElementOverrides(builder:flatbuffers.Builder, elementOverridesOffset:flatbuffers.Offset) {
80-
builder.addFieldOffset(2, elementOverridesOffset, 0);
81-
}
82-
83-
static createElementOverridesVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
84-
builder.startVector(4, data.length, 4);
85-
for (let i = data.length - 1; i >= 0; i--) {
86-
builder.addOffset(data[i]!);
87-
}
88-
return builder.endVector();
89-
}
90-
91-
static startElementOverridesVector(builder:flatbuffers.Builder, numElems:number) {
92-
builder.startVector(4, numElems, 4);
93-
}
94-
95-
static addAttributeValues(builder:flatbuffers.Builder, attributeValuesOffset:flatbuffers.Offset) {
96-
builder.addFieldOffset(3, attributeValuesOffset, 0);
97-
}
98-
99-
static createAttributeValuesVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
100-
builder.startVector(4, data.length, 4);
101-
for (let i = data.length - 1; i >= 0; i--) {
102-
builder.addOffset(data[i]!);
103-
}
104-
return builder.endVector();
105-
}
106-
107-
static startAttributeValuesVector(builder:flatbuffers.Builder, numElems:number) {
108-
builder.startVector(4, numElems, 4);
109-
}
110-
111-
static addDuplicationArray(builder:flatbuffers.Builder, duplicationArrayOffset:flatbuffers.Offset) {
112-
builder.addFieldOffset(4, duplicationArrayOffset, 0);
113-
}
114-
11529
static endDucBlockInstanceElement(builder:flatbuffers.Builder):flatbuffers.Offset {
11630
const offset = builder.endObject();
11731
return offset;
Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
// automatically generated by the FlatBuffers compiler, do not modify
2+
3+
/* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/no-explicit-any, @typescript-eslint/no-non-null-assertion */
4+
5+
import * as flatbuffers from 'flatbuffers';
6+
7+
import { DucBlockDuplicationArray } from '../duc/duc-block-duplication-array';
8+
import { StringValueEntry } from '../duc/string-value-entry';
9+
10+
11+
export class DucBlockInstance {
12+
bb: flatbuffers.ByteBuffer|null = null;
13+
bb_pos = 0;
14+
__init(i:number, bb:flatbuffers.ByteBuffer):DucBlockInstance {
15+
this.bb_pos = i;
16+
this.bb = bb;
17+
return this;
18+
}
19+
20+
static getRootAsDucBlockInstance(bb:flatbuffers.ByteBuffer, obj?:DucBlockInstance):DucBlockInstance {
21+
return (obj || new DucBlockInstance()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
22+
}
23+
24+
static getSizePrefixedRootAsDucBlockInstance(bb:flatbuffers.ByteBuffer, obj?:DucBlockInstance):DucBlockInstance {
25+
bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
26+
return (obj || new DucBlockInstance()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
27+
}
28+
29+
id():string|null
30+
id(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
31+
id(optionalEncoding?:any):string|Uint8Array|null {
32+
const offset = this.bb!.__offset(this.bb_pos, 4);
33+
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
34+
}
35+
36+
blockId():string|null
37+
blockId(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
38+
blockId(optionalEncoding?:any):string|Uint8Array|null {
39+
const offset = this.bb!.__offset(this.bb_pos, 6);
40+
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
41+
}
42+
43+
elementOverrides(index: number, obj?:StringValueEntry):StringValueEntry|null {
44+
const offset = this.bb!.__offset(this.bb_pos, 8);
45+
return offset ? (obj || new StringValueEntry()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
46+
}
47+
48+
elementOverridesLength():number {
49+
const offset = this.bb!.__offset(this.bb_pos, 8);
50+
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
51+
}
52+
53+
attributeValues(index: number, obj?:StringValueEntry):StringValueEntry|null {
54+
const offset = this.bb!.__offset(this.bb_pos, 10);
55+
return offset ? (obj || new StringValueEntry()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
56+
}
57+
58+
attributeValuesLength():number {
59+
const offset = this.bb!.__offset(this.bb_pos, 10);
60+
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
61+
}
62+
63+
duplicationArray(obj?:DucBlockDuplicationArray):DucBlockDuplicationArray|null {
64+
const offset = this.bb!.__offset(this.bb_pos, 12);
65+
return offset ? (obj || new DucBlockDuplicationArray()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
66+
}
67+
68+
version():number {
69+
const offset = this.bb!.__offset(this.bb_pos, 14);
70+
return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
71+
}
72+
73+
static startDucBlockInstance(builder:flatbuffers.Builder) {
74+
builder.startObject(6);
75+
}
76+
77+
static addId(builder:flatbuffers.Builder, idOffset:flatbuffers.Offset) {
78+
builder.addFieldOffset(0, idOffset, 0);
79+
}
80+
81+
static addBlockId(builder:flatbuffers.Builder, blockIdOffset:flatbuffers.Offset) {
82+
builder.addFieldOffset(1, blockIdOffset, 0);
83+
}
84+
85+
static addElementOverrides(builder:flatbuffers.Builder, elementOverridesOffset:flatbuffers.Offset) {
86+
builder.addFieldOffset(2, elementOverridesOffset, 0);
87+
}
88+
89+
static createElementOverridesVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
90+
builder.startVector(4, data.length, 4);
91+
for (let i = data.length - 1; i >= 0; i--) {
92+
builder.addOffset(data[i]!);
93+
}
94+
return builder.endVector();
95+
}
96+
97+
static startElementOverridesVector(builder:flatbuffers.Builder, numElems:number) {
98+
builder.startVector(4, numElems, 4);
99+
}
100+
101+
static addAttributeValues(builder:flatbuffers.Builder, attributeValuesOffset:flatbuffers.Offset) {
102+
builder.addFieldOffset(3, attributeValuesOffset, 0);
103+
}
104+
105+
static createAttributeValuesVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
106+
builder.startVector(4, data.length, 4);
107+
for (let i = data.length - 1; i >= 0; i--) {
108+
builder.addOffset(data[i]!);
109+
}
110+
return builder.endVector();
111+
}
112+
113+
static startAttributeValuesVector(builder:flatbuffers.Builder, numElems:number) {
114+
builder.startVector(4, numElems, 4);
115+
}
116+
117+
static addDuplicationArray(builder:flatbuffers.Builder, duplicationArrayOffset:flatbuffers.Offset) {
118+
builder.addFieldOffset(4, duplicationArrayOffset, 0);
119+
}
120+
121+
static addVersion(builder:flatbuffers.Builder, version:number) {
122+
builder.addFieldInt32(5, version, 0);
123+
}
124+
125+
static endDucBlockInstance(builder:flatbuffers.Builder):flatbuffers.Offset {
126+
const offset = builder.endObject();
127+
return offset;
128+
}
129+
130+
}

packages/ducjs/src/flatbuffers/duc/duc-block.ts

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import * as flatbuffers from 'flatbuffers';
66

77
import { DucBlockAttributeDefinitionEntry } from '../duc/duc-block-attribute-definition-entry';
8-
import { ElementWrapper } from '../duc/element-wrapper';
98

109

1110
export class DucBlock {
@@ -52,28 +51,18 @@ version():number {
5251
return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
5352
}
5453

55-
elements(index: number, obj?:ElementWrapper):ElementWrapper|null {
56-
const offset = this.bb!.__offset(this.bb_pos, 12);
57-
return offset ? (obj || new ElementWrapper()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
58-
}
59-
60-
elementsLength():number {
61-
const offset = this.bb!.__offset(this.bb_pos, 12);
62-
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
63-
}
64-
6554
attributeDefinitions(index: number, obj?:DucBlockAttributeDefinitionEntry):DucBlockAttributeDefinitionEntry|null {
66-
const offset = this.bb!.__offset(this.bb_pos, 14);
55+
const offset = this.bb!.__offset(this.bb_pos, 12);
6756
return offset ? (obj || new DucBlockAttributeDefinitionEntry()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
6857
}
6958

7059
attributeDefinitionsLength():number {
71-
const offset = this.bb!.__offset(this.bb_pos, 14);
60+
const offset = this.bb!.__offset(this.bb_pos, 12);
7261
return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
7362
}
7463

7564
static startDucBlock(builder:flatbuffers.Builder) {
76-
builder.startObject(6);
65+
builder.startObject(5);
7766
}
7867

7968
static addId(builder:flatbuffers.Builder, idOffset:flatbuffers.Offset) {
@@ -92,24 +81,8 @@ static addVersion(builder:flatbuffers.Builder, version:number) {
9281
builder.addFieldInt32(3, version, 0);
9382
}
9483

95-
static addElements(builder:flatbuffers.Builder, elementsOffset:flatbuffers.Offset) {
96-
builder.addFieldOffset(4, elementsOffset, 0);
97-
}
98-
99-
static createElementsVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
100-
builder.startVector(4, data.length, 4);
101-
for (let i = data.length - 1; i >= 0; i--) {
102-
builder.addOffset(data[i]!);
103-
}
104-
return builder.endVector();
105-
}
106-
107-
static startElementsVector(builder:flatbuffers.Builder, numElems:number) {
108-
builder.startVector(4, numElems, 4);
109-
}
110-
11184
static addAttributeDefinitions(builder:flatbuffers.Builder, attributeDefinitionsOffset:flatbuffers.Offset) {
112-
builder.addFieldOffset(5, attributeDefinitionsOffset, 0);
85+
builder.addFieldOffset(4, attributeDefinitionsOffset, 0);
11386
}
11487

11588
static createAttributeDefinitionsVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
@@ -130,13 +103,12 @@ static endDucBlock(builder:flatbuffers.Builder):flatbuffers.Offset {
130103
return offset;
131104
}
132105

133-
static createDucBlock(builder:flatbuffers.Builder, idOffset:flatbuffers.Offset, labelOffset:flatbuffers.Offset, descriptionOffset:flatbuffers.Offset, version:number, elementsOffset:flatbuffers.Offset, attributeDefinitionsOffset:flatbuffers.Offset):flatbuffers.Offset {
106+
static createDucBlock(builder:flatbuffers.Builder, idOffset:flatbuffers.Offset, labelOffset:flatbuffers.Offset, descriptionOffset:flatbuffers.Offset, version:number, attributeDefinitionsOffset:flatbuffers.Offset):flatbuffers.Offset {
134107
DucBlock.startDucBlock(builder);
135108
DucBlock.addId(builder, idOffset);
136109
DucBlock.addLabel(builder, labelOffset);
137110
DucBlock.addDescription(builder, descriptionOffset);
138111
DucBlock.addVersion(builder, version);
139-
DucBlock.addElements(builder, elementsOffset);
140112
DucBlock.addAttributeDefinitions(builder, attributeDefinitionsOffset);
141113
return DucBlock.endDucBlock(builder);
142114
}

0 commit comments

Comments
 (0)