diff --git a/apps/oxlint/src-js/generated/deserialize.js b/apps/oxlint/src-js/generated/deserialize.js index fe14b91cfc704..c439abf50ed36 100644 --- a/apps/oxlint/src-js/generated/deserialize.js +++ b/apps/oxlint/src-js/generated/deserialize.js @@ -15,10 +15,6 @@ const textDecoder = new TextDecoder('utf-8', { ignoreBOM: true }), }, }); -export function deserialize(buffer, sourceText, sourceByteLen) { - return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); -} - export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); } @@ -5578,203 +5574,6 @@ function deserializeComment(pos) { }; } -function deserializeNameSpan(pos) { - let start = deserializeU32(pos), end = deserializeU32(pos + 4); - return { - __proto__: NodeProto, - value: deserializeStr(pos + 8), - start, - end, - range: [start, end], - }; -} - -function deserializeImportEntry(pos) { - return { - importName: deserializeImportImportName(pos + 32), - localName: deserializeNameSpan(pos + 64), - isType: deserializeBool(pos + 88), - }; -} - -function deserializeImportImportName(pos) { - switch (uint8[pos]) { - case 0: - var nameSpan = deserializeNameSpan(pos + 8); - return { - __proto__: NodeProto, - kind: 'Name', - name: nameSpan.value, - start: nameSpan.start, - end: nameSpan.end, - range: nameSpan.range, - }; - case 1: - return { - __proto__: NodeProto, - kind: 'NamespaceObject', - name: null, - start: null, - end: null, - range: [null, null], - }; - case 2: - var { start, end } = deserializeSpan(pos + 8); - return { - __proto__: NodeProto, - kind: 'Default', - name: null, - start, - end, - range: [start, end], - }; - default: - throw Error(`Unexpected discriminant ${uint8[pos]} for ImportImportName`); - } -} - -function deserializeExportEntry(pos) { - let start = deserializeU32(pos), end = deserializeU32(pos + 4); - return { - __proto__: NodeProto, - moduleRequest: deserializeOptionNameSpan(pos + 16), - importName: deserializeExportImportName(pos + 40), - exportName: deserializeExportExportName(pos + 72), - localName: deserializeExportLocalName(pos + 104), - isType: deserializeBool(pos + 136), - start, - end, - range: [start, end], - }; -} - -function deserializeExportImportName(pos) { - switch (uint8[pos]) { - case 0: - var nameSpan = deserializeNameSpan(pos + 8); - return { - __proto__: NodeProto, - kind: 'Name', - name: nameSpan.value, - start: nameSpan.start, - end: nameSpan.end, - range: nameSpan.range, - }; - case 1: - return { - __proto__: NodeProto, - kind: 'All', - name: null, - start: null, - end: null, - range: [null, null], - }; - case 2: - return { - __proto__: NodeProto, - kind: 'AllButDefault', - name: null, - start: null, - end: null, - range: [null, null], - }; - case 3: - return { - __proto__: NodeProto, - kind: 'None', - name: null, - start: null, - end: null, - range: [null, null], - }; - default: - throw Error(`Unexpected discriminant ${uint8[pos]} for ExportImportName`); - } -} - -function deserializeExportExportName(pos) { - switch (uint8[pos]) { - case 0: - var nameSpan = deserializeNameSpan(pos + 8); - return { - __proto__: NodeProto, - kind: 'Name', - name: nameSpan.value, - start: nameSpan.start, - end: nameSpan.end, - range: nameSpan.range, - }; - case 1: - var { start, end } = deserializeSpan(pos + 8); - return { - __proto__: NodeProto, - kind: 'Default', - name: null, - start, - end, - range: [start, end], - }; - case 2: - return { - __proto__: NodeProto, - kind: 'None', - name: null, - start: null, - end: null, - range: [null, null], - }; - default: - throw Error(`Unexpected discriminant ${uint8[pos]} for ExportExportName`); - } -} - -function deserializeExportLocalName(pos) { - switch (uint8[pos]) { - case 0: - var nameSpan = deserializeNameSpan(pos + 8); - return { - __proto__: NodeProto, - kind: 'Name', - name: nameSpan.value, - start: nameSpan.start, - end: nameSpan.end, - range: nameSpan.range, - }; - case 1: - var nameSpan = deserializeNameSpan(pos + 8); - return { - __proto__: NodeProto, - kind: 'Default', - name: nameSpan.value, - start: nameSpan.start, - end: nameSpan.end, - range: nameSpan.range, - }; - case 2: - return { - __proto__: NodeProto, - kind: 'None', - name: null, - start: null, - end: null, - range: [null, null], - }; - default: - throw Error(`Unexpected discriminant ${uint8[pos]} for ExportLocalName`); - } -} - -function deserializeDynamicImport(pos) { - let start = deserializeU32(pos), end = deserializeU32(pos + 4); - return { - __proto__: NodeProto, - moduleRequest: deserializeSpan(pos + 8), - start, - end, - range: [start, end], - }; -} - function deserializeAssignmentOperator(pos) { switch (uint8[pos]) { case 0: @@ -5910,13 +5709,6 @@ function deserializeUpdateOperator(pos) { } } -function deserializeSpan(pos) { - return { - start: deserializeU32(pos), - end: deserializeU32(pos + 4), - }; -} - function deserializeModuleKind(pos) { switch (uint8[pos]) { case 0: @@ -5928,82 +5720,6 @@ function deserializeModuleKind(pos) { } } -function deserializeRawTransferData(pos) { - return { - program: deserializeProgram(pos), - comments: deserializeVecComment(pos + 128), - module: deserializeEcmaScriptModule(pos + 152), - errors: deserializeVecError(pos + 256), - }; -} - -function deserializeError(pos) { - return { - severity: deserializeErrorSeverity(pos + 72), - message: deserializeStr(pos), - labels: deserializeVecErrorLabel(pos + 16), - helpMessage: deserializeOptionStr(pos + 40), - codeframe: deserializeStr(pos + 56), - }; -} - -function deserializeErrorSeverity(pos) { - switch (uint8[pos]) { - case 0: - return 'Error'; - case 1: - return 'Warning'; - case 2: - return 'Advice'; - default: - throw Error(`Unexpected discriminant ${uint8[pos]} for ErrorSeverity`); - } -} - -function deserializeErrorLabel(pos) { - let start = deserializeU32(pos), end = deserializeU32(pos + 4); - return { - __proto__: NodeProto, - message: deserializeOptionStr(pos + 8), - start, - end, - range: [start, end], - }; -} - -function deserializeEcmaScriptModule(pos) { - return { - hasModuleSyntax: deserializeBool(pos + 96), - staticImports: deserializeVecStaticImport(pos), - staticExports: deserializeVecStaticExport(pos + 24), - dynamicImports: deserializeVecDynamicImport(pos + 48), - importMetas: deserializeVecSpan(pos + 72), - }; -} - -function deserializeStaticImport(pos) { - let start = deserializeU32(pos), end = deserializeU32(pos + 4); - return { - __proto__: NodeProto, - moduleRequest: deserializeNameSpan(pos + 8), - entries: deserializeVecImportEntry(pos + 32), - start, - end, - range: [start, end], - }; -} - -function deserializeStaticExport(pos) { - let start = deserializeU32(pos), end = deserializeU32(pos + 4); - return { - __proto__: NodeProto, - entries: deserializeVecExportEntry(pos + 8), - start, - end, - range: [start, end], - }; -} - function deserializeU32(pos) { return uint32[pos >> 2]; } @@ -7192,96 +6908,3 @@ function deserializeOptionTSMappedTypeModifierOperator(pos) { function deserializeBoxTSExternalModuleReference(pos) { return deserializeTSExternalModuleReference(uint32[pos >> 2]); } - -function deserializeOptionNameSpan(pos) { - if (uint32[pos + 8 >> 2] === 0 && uint32[pos + 12 >> 2] === 0) return null; - return deserializeNameSpan(pos); -} - -function deserializeVecError(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 80; - for (; pos !== endPos;) { - arr.push(deserializeError(pos)); - pos += 80; - } - return arr; -} - -function deserializeVecErrorLabel(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 24; - for (; pos !== endPos;) { - arr.push(deserializeErrorLabel(pos)); - pos += 24; - } - return arr; -} - -function deserializeVecStaticImport(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 56; - for (; pos !== endPos;) { - arr.push(deserializeStaticImport(pos)); - pos += 56; - } - return arr; -} - -function deserializeVecStaticExport(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 32; - for (; pos !== endPos;) { - arr.push(deserializeStaticExport(pos)); - pos += 32; - } - return arr; -} - -function deserializeVecDynamicImport(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 16; - for (; pos !== endPos;) { - arr.push(deserializeDynamicImport(pos)); - pos += 16; - } - return arr; -} - -function deserializeVecSpan(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 8; - for (; pos !== endPos;) { - arr.push(deserializeSpan(pos)); - pos += 8; - } - return arr; -} - -function deserializeVecImportEntry(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 96; - for (; pos !== endPos;) { - arr.push(deserializeImportEntry(pos)); - pos += 96; - } - return arr; -} - -function deserializeVecExportEntry(pos) { - let arr = [], pos32 = pos >> 2; - pos = uint32[pos32]; - let endPos = pos + uint32[pos32 + 2] * 144; - for (; pos !== endPos;) { - arr.push(deserializeExportEntry(pos)); - pos += 144; - } - return arr; -} diff --git a/napi/parser/generated/deserialize/js.js b/napi/parser/generated/deserialize/js.js index 3323f800cd156..63c3fe4468426 100644 --- a/napi/parser/generated/deserialize/js.js +++ b/napi/parser/generated/deserialize/js.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/napi/parser/generated/deserialize/js_parent.js b/napi/parser/generated/deserialize/js_parent.js index a6552bf9cf7c6..ef6df240c98ec 100644 --- a/napi/parser/generated/deserialize/js_parent.js +++ b/napi/parser/generated/deserialize/js_parent.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/napi/parser/generated/deserialize/js_range.js b/napi/parser/generated/deserialize/js_range.js index cd4780ba44fb4..af207b86a70cd 100644 --- a/napi/parser/generated/deserialize/js_range.js +++ b/napi/parser/generated/deserialize/js_range.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/napi/parser/generated/deserialize/js_range_parent.js b/napi/parser/generated/deserialize/js_range_parent.js index 49323055dfdc4..27ff31fe643a1 100644 --- a/napi/parser/generated/deserialize/js_range_parent.js +++ b/napi/parser/generated/deserialize/js_range_parent.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/napi/parser/generated/deserialize/ts.js b/napi/parser/generated/deserialize/ts.js index 04f762658bd30..881b1ab131d31 100644 --- a/napi/parser/generated/deserialize/ts.js +++ b/napi/parser/generated/deserialize/ts.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/napi/parser/generated/deserialize/ts_parent.js b/napi/parser/generated/deserialize/ts_parent.js index 42ecfe146315d..3037538303903 100644 --- a/napi/parser/generated/deserialize/ts_parent.js +++ b/napi/parser/generated/deserialize/ts_parent.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/napi/parser/generated/deserialize/ts_range.js b/napi/parser/generated/deserialize/ts_range.js index 502453c49c1c5..12e6bd1b2bd11 100644 --- a/napi/parser/generated/deserialize/ts_range.js +++ b/napi/parser/generated/deserialize/ts_range.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/napi/parser/generated/deserialize/ts_range_parent.js b/napi/parser/generated/deserialize/ts_range_parent.js index 3836fbfa65a69..c7eb07fee73a6 100644 --- a/napi/parser/generated/deserialize/ts_range_parent.js +++ b/napi/parser/generated/deserialize/ts_range_parent.js @@ -11,10 +11,6 @@ export function deserialize(buffer, sourceText, sourceByteLen) { return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); } -export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) { - return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); -} - function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) { uint8 = buffer; uint32 = buffer.uint32; diff --git a/tasks/ast_tools/src/generators/raw_transfer.rs b/tasks/ast_tools/src/generators/raw_transfer.rs index 35eaa9e5a1ee2..d5186a4662b0f 100644 --- a/tasks/ast_tools/src/generators/raw_transfer.rs +++ b/tasks/ast_tools/src/generators/raw_transfer.rs @@ -152,13 +152,17 @@ fn generate_deserializers( }} }}); + /* IF !LINTER */ export function deserialize(buffer, sourceText, sourceByteLen) {{ return deserializeWith(buffer, sourceText, sourceByteLen, null, deserializeRawTransferData); }} + /* END_IF */ + /* IF LINTER */ export function deserializeProgramOnly(buffer, sourceText, sourceByteLen, getLoc) {{ return deserializeWith(buffer, sourceText, sourceByteLen, getLoc, deserializeProgram); }} + /* END_IF */ function deserializeWith(buffer, sourceTextInput, sourceByteLenInput, getLocInput, deserialize) {{ uint8 = buffer; @@ -216,11 +220,11 @@ fn generate_deserializers( variant_paths: Vec, } - impl VariantGenerator<6> for VariantGen { - const FLAG_NAMES: [&str; 6] = - ["IS_TS", "RANGE", "LOC", "PARENT", "PRESERVE_PARENS", "COMMENTS"]; + impl VariantGenerator<7> for VariantGen { + const FLAG_NAMES: [&str; 7] = + ["IS_TS", "RANGE", "LOC", "PARENT", "PRESERVE_PARENS", "COMMENTS", "LINTER"]; - fn variants(&mut self) -> Vec<[bool; 6]> { + fn variants(&mut self) -> Vec<[bool; 7]> { let mut variants = Vec::with_capacity(9); // Parser deserializers @@ -237,6 +241,7 @@ fn generate_deserializers( variants.push([ is_ts, range, /* loc */ false, parent, /* preserve_parens */ true, /* comments */ false, + /* linter */ false, ]); } } @@ -247,6 +252,7 @@ fn generate_deserializers( variants.push([ /* is_ts */ true, /* range */ true, /* loc */ true, /* parent */ true, /* preserve_parens */ false, /* comments */ true, + /* linter */ true, ]); variants @@ -255,7 +261,7 @@ fn generate_deserializers( fn pre_process_variant<'a>( &self, program: &mut Program<'a>, - flags: [bool; 6], + flags: [bool; 7], allocator: &'a Allocator, ) { if flags[2] {