node-llama-cpp 3.2.0 → 3.3.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.
Files changed (144) hide show
  1. package/dist/bindings/AddonTypes.d.ts +4 -3
  2. package/dist/bindings/Llama.d.ts +1 -1
  3. package/dist/bindings/Llama.js +17 -2
  4. package/dist/bindings/Llama.js.map +1 -1
  5. package/dist/bindings/getLlama.d.ts +4 -1
  6. package/dist/bindings/getLlama.js +42 -2
  7. package/dist/bindings/getLlama.js.map +1 -1
  8. package/dist/bindings/utils/compileLLamaCpp.d.ts +1 -1
  9. package/dist/bindings/utils/compileLLamaCpp.js +41 -2
  10. package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
  11. package/dist/bindings/utils/testBindingBinary.d.ts +2 -1
  12. package/dist/bindings/utils/testBindingBinary.js +122 -37
  13. package/dist/bindings/utils/testBindingBinary.js.map +1 -1
  14. package/dist/chatWrappers/Llama3_1ChatWrapper.js +3 -2
  15. package/dist/chatWrappers/Llama3_1ChatWrapper.js.map +1 -1
  16. package/dist/chatWrappers/Llama3_2LightweightChatWrapper.d.ts +35 -0
  17. package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js +253 -0
  18. package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js.map +1 -0
  19. package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.d.ts +13 -0
  20. package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js +30 -0
  21. package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js.map +1 -1
  22. package/dist/chatWrappers/utils/getModelLinageNames.d.ts +2 -0
  23. package/dist/chatWrappers/utils/getModelLinageNames.js +18 -0
  24. package/dist/chatWrappers/utils/getModelLinageNames.js.map +1 -0
  25. package/dist/chatWrappers/utils/isLlama3_2LightweightModel.d.ts +2 -0
  26. package/dist/chatWrappers/utils/isLlama3_2LightweightModel.js +9 -0
  27. package/dist/chatWrappers/utils/isLlama3_2LightweightModel.js.map +1 -0
  28. package/dist/chatWrappers/utils/resolveChatWrapper.d.ts +4 -2
  29. package/dist/chatWrappers/utils/resolveChatWrapper.js +9 -31
  30. package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
  31. package/dist/cli/commands/ChatCommand.js +1 -1
  32. package/dist/cli/commands/ChatCommand.js.map +1 -1
  33. package/dist/cli/commands/InitCommand.d.ts +2 -1
  34. package/dist/cli/commands/InitCommand.js +32 -13
  35. package/dist/cli/commands/InitCommand.js.map +1 -1
  36. package/dist/cli/recommendedModels.js +11 -0
  37. package/dist/cli/recommendedModels.js.map +1 -1
  38. package/dist/evaluator/LlamaChat/LlamaChat.js +25 -12
  39. package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
  40. package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +140 -132
  41. package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
  42. package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +1 -1
  43. package/dist/evaluator/LlamaGrammar.js +7 -0
  44. package/dist/evaluator/LlamaGrammar.js.map +1 -1
  45. package/dist/evaluator/LlamaJsonSchemaGrammar.d.ts +3 -2
  46. package/dist/evaluator/LlamaJsonSchemaGrammar.js +3 -0
  47. package/dist/evaluator/LlamaJsonSchemaGrammar.js.map +1 -1
  48. package/dist/gguf/fileReaders/GgufFileReader.d.ts +1 -1
  49. package/dist/gguf/fileReaders/GgufFsFileReader.d.ts +1 -1
  50. package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.d.ts +1 -1
  51. package/dist/index.d.ts +3 -2
  52. package/dist/index.js +2 -1
  53. package/dist/index.js.map +1 -1
  54. package/dist/tsconfig.tsbuildinfo +1 -1
  55. package/dist/types.d.ts +2 -2
  56. package/dist/utils/gbnfJson/GbnfGrammarGenerator.d.ts +5 -0
  57. package/dist/utils/gbnfJson/GbnfGrammarGenerator.js +15 -0
  58. package/dist/utils/gbnfJson/GbnfGrammarGenerator.js.map +1 -1
  59. package/dist/utils/gbnfJson/GbnfTerminal.d.ts +3 -0
  60. package/dist/utils/gbnfJson/GbnfTerminal.js +25 -3
  61. package/dist/utils/gbnfJson/GbnfTerminal.js.map +1 -1
  62. package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.d.ts +1 -1
  63. package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.js.map +1 -1
  64. package/dist/utils/gbnfJson/terminals/GbnfAnyJson.d.ts +9 -0
  65. package/dist/utils/gbnfJson/terminals/GbnfAnyJson.js +53 -0
  66. package/dist/utils/gbnfJson/terminals/GbnfAnyJson.js.map +1 -0
  67. package/dist/utils/gbnfJson/terminals/GbnfArray.d.ts +11 -2
  68. package/dist/utils/gbnfJson/terminals/GbnfArray.js +64 -15
  69. package/dist/utils/gbnfJson/terminals/GbnfArray.js.map +1 -1
  70. package/dist/utils/gbnfJson/terminals/GbnfBoolean.d.ts +3 -2
  71. package/dist/utils/gbnfJson/terminals/GbnfBoolean.js +13 -7
  72. package/dist/utils/gbnfJson/terminals/GbnfBoolean.js.map +1 -1
  73. package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.d.ts +11 -0
  74. package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.js +28 -0
  75. package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.js.map +1 -0
  76. package/dist/utils/gbnfJson/terminals/GbnfFormatString.d.ts +11 -0
  77. package/dist/utils/gbnfJson/terminals/GbnfFormatString.js +90 -0
  78. package/dist/utils/gbnfJson/terminals/GbnfFormatString.js.map +1 -0
  79. package/dist/utils/gbnfJson/terminals/GbnfGrammar.d.ts +4 -1
  80. package/dist/utils/gbnfJson/terminals/GbnfGrammar.js +8 -1
  81. package/dist/utils/gbnfJson/terminals/GbnfGrammar.js.map +1 -1
  82. package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.d.ts +5 -0
  83. package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.js +24 -0
  84. package/dist/utils/gbnfJson/terminals/GbnfInsideStringChar.js.map +1 -0
  85. package/dist/utils/gbnfJson/terminals/GbnfNumber.js +4 -3
  86. package/dist/utils/gbnfJson/terminals/GbnfNumber.js.map +1 -1
  87. package/dist/utils/gbnfJson/terminals/GbnfNumberValue.d.ts +3 -1
  88. package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js +8 -2
  89. package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js.map +1 -1
  90. package/dist/utils/gbnfJson/terminals/GbnfObjectMap.d.ts +14 -5
  91. package/dist/utils/gbnfJson/terminals/GbnfObjectMap.js +67 -9
  92. package/dist/utils/gbnfJson/terminals/GbnfObjectMap.js.map +1 -1
  93. package/dist/utils/gbnfJson/terminals/GbnfOr.d.ts +2 -1
  94. package/dist/utils/gbnfJson/terminals/GbnfOr.js +6 -2
  95. package/dist/utils/gbnfJson/terminals/GbnfOr.js.map +1 -1
  96. package/dist/utils/gbnfJson/terminals/GbnfRepetition.d.ts +7 -1
  97. package/dist/utils/gbnfJson/terminals/GbnfRepetition.js +69 -20
  98. package/dist/utils/gbnfJson/terminals/GbnfRepetition.js.map +1 -1
  99. package/dist/utils/gbnfJson/terminals/GbnfString.d.ts +8 -1
  100. package/dist/utils/gbnfJson/terminals/GbnfString.js +31 -21
  101. package/dist/utils/gbnfJson/terminals/GbnfString.js.map +1 -1
  102. package/dist/utils/gbnfJson/terminals/GbnfStringValue.d.ts +2 -0
  103. package/dist/utils/gbnfJson/terminals/GbnfStringValue.js +7 -4
  104. package/dist/utils/gbnfJson/terminals/GbnfStringValue.js.map +1 -1
  105. package/dist/utils/gbnfJson/terminals/GbnfWhitespace.d.ts +2 -1
  106. package/dist/utils/gbnfJson/terminals/GbnfWhitespace.js +24 -5
  107. package/dist/utils/gbnfJson/terminals/GbnfWhitespace.js.map +1 -1
  108. package/dist/utils/gbnfJson/terminals/gbnfConsts.d.ts +16 -1
  109. package/dist/utils/gbnfJson/terminals/gbnfConsts.js +47 -1
  110. package/dist/utils/gbnfJson/terminals/gbnfConsts.js.map +1 -1
  111. package/dist/utils/gbnfJson/types.d.ts +164 -17
  112. package/dist/utils/gbnfJson/types.js +6 -0
  113. package/dist/utils/gbnfJson/types.js.map +1 -1
  114. package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js +61 -9
  115. package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js.map +1 -1
  116. package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js +99 -8
  117. package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js.map +1 -1
  118. package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js +125 -16
  119. package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map +1 -1
  120. package/dist/utils/includesText.d.ts +1 -0
  121. package/dist/utils/includesText.js +12 -0
  122. package/dist/utils/includesText.js.map +1 -0
  123. package/dist/utils/wrapAbortSignal.d.ts +1 -1
  124. package/dist/utils/wrapAbortSignal.js +9 -4
  125. package/dist/utils/wrapAbortSignal.js.map +1 -1
  126. package/llama/CMakeLists.txt +10 -90
  127. package/llama/addon/AddonGrammar.cpp +49 -1
  128. package/llama/addon/AddonGrammar.h +3 -0
  129. package/llama/addon/addon.cpp +17 -0
  130. package/llama/addon/globals/getGpuInfo.cpp +54 -52
  131. package/llama/binariesGithubRelease.json +1 -1
  132. package/llama/gitRelease.bundle +0 -0
  133. package/llama/gpuInfo/vulkan-gpu-info.cpp +0 -8
  134. package/llama/gpuInfo/vulkan-gpu-info.h +0 -1
  135. package/llama/grammars/README.md +1 -1
  136. package/llama/llama.cpp.info.json +1 -1
  137. package/package.json +49 -45
  138. package/templates/README.md +6 -0
  139. package/templates/packed/electron-typescript-react.json +1 -1
  140. package/templates/packed/node-typescript.json +1 -1
  141. package/llama/gpuInfo/cuda-gpu-info.cu +0 -120
  142. package/llama/gpuInfo/cuda-gpu-info.h +0 -10
  143. package/llama/gpuInfo/metal-gpu-info.h +0 -8
  144. package/llama/gpuInfo/metal-gpu-info.mm +0 -37
@@ -1 +1 @@
1
- {"root":["../src/index.ts","../src/ChatWrapper.ts","../src/apiDocsIndex.ts","../src/commands.ts","../src/config.ts","../src/consts.ts","../src/state.ts","../src/types.ts","../src/bindings/AddonTypes.ts","../src/bindings/Llama.ts","../src/bindings/consts.ts","../src/bindings/getLlama.ts","../src/bindings/types.ts","../src/bindings/utils/MemoryOrchestrator.ts","../src/bindings/utils/NoBinaryFoundError.ts","../src/bindings/utils/asyncEvery.ts","../src/bindings/utils/asyncSome.ts","../src/bindings/utils/binariesGithubRelease.ts","../src/bindings/utils/clearAllLocalBuilds.ts","../src/bindings/utils/cloneLlamaCppRepo.ts","../src/bindings/utils/compileLLamaCpp.ts","../src/bindings/utils/detectAvailableComputeLayers.ts","../src/bindings/utils/detectGlibc.ts","../src/bindings/utils/getBestComputeLayersAvailable.ts","../src/bindings/utils/getBuildFolderNameForBuildOptions.ts","../src/bindings/utils/getCanUsePrebuiltBinaries.ts","../src/bindings/utils/getExampleUsageCodeOfGetLlama.ts","../src/bindings/utils/getGpuTypesToUseForOption.ts","../src/bindings/utils/getLinuxDistroInfo.ts","../src/bindings/utils/getLlamaWithoutBackend.ts","../src/bindings/utils/getPlatform.ts","../src/bindings/utils/getPlatformInfo.ts","../src/bindings/utils/hasBuildingFromSourceDependenciesInstalled.ts","../src/bindings/utils/hasFileInPath.ts","../src/bindings/utils/lastBuildInfo.ts","../src/bindings/utils/logBinaryUsageExampleToConsole.ts","../src/bindings/utils/logDistroInstallInstruction.ts","../src/bindings/utils/resolveCustomCmakeOptions.ts","../src/bindings/utils/testBindingBinary.ts","../src/bindings/utils/testCmakeBinary.ts","../src/chatWrappers/AlpacaChatWrapper.ts","../src/chatWrappers/ChatMLChatWrapper.ts","../src/chatWrappers/EmptyChatWrapper.ts","../src/chatWrappers/FalconChatWrapper.ts","../src/chatWrappers/FunctionaryChatWrapper.ts","../src/chatWrappers/GemmaChatWrapper.ts","../src/chatWrappers/GeneralChatWrapper.ts","../src/chatWrappers/Llama2ChatWrapper.ts","../src/chatWrappers/Llama3ChatWrapper.ts","../src/chatWrappers/Llama3_1ChatWrapper.ts","../src/chatWrappers/MistralChatWrapper.ts","../src/chatWrappers/generic/JinjaTemplateChatWrapper.ts","../src/chatWrappers/generic/TemplateChatWrapper.ts","../src/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.ts","../src/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.ts","../src/chatWrappers/utils/chunkChatItems.ts","../src/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.ts","../src/chatWrappers/utils/jsonDumps.ts","../src/chatWrappers/utils/resolveChatWrapper.ts","../src/cli/cli.ts","../src/cli/projectTemplates.ts","../src/cli/recommendedModels.ts","../src/cli/startCreateCli.ts","../src/cli/commands/ChatCommand.ts","../src/cli/commands/CompleteCommand.ts","../src/cli/commands/DebugCommand.ts","../src/cli/commands/InfillCommand.ts","../src/cli/commands/InitCommand.ts","../src/cli/commands/OnPostInstallCommand.ts","../src/cli/commands/PullCommand.ts","../src/cli/commands/inspect/InspectCommand.ts","../src/cli/commands/inspect/commands/InspectEstimateCommand.ts","../src/cli/commands/inspect/commands/InspectGgufCommand.ts","../src/cli/commands/inspect/commands/InspectGpuCommand.ts","../src/cli/commands/inspect/commands/InspectMeasureCommand.ts","../src/cli/commands/source/SourceCommand.ts","../src/cli/commands/source/commands/BuildCommand.ts","../src/cli/commands/source/commands/ClearCommand.ts","../src/cli/commands/source/commands/DownloadCommand.ts","../src/cli/utils/ConsoleInteraction.ts","../src/cli/utils/ConsoleTable.ts","../src/cli/utils/basicChooseFromListConsoleInteraction.ts","../src/cli/utils/consolePromptQuestion.ts","../src/cli/utils/getReadablePath.ts","../src/cli/utils/interactivelyAskForModel.ts","../src/cli/utils/logUsedGpuTypeOption.ts","../src/cli/utils/printCommonInfoLines.ts","../src/cli/utils/printInfoLine.ts","../src/cli/utils/printModelDestination.ts","../src/cli/utils/projectTemplates.ts","../src/cli/utils/renderModelCompatibilityPercentageWithColors.ts","../src/cli/utils/resolveCommandGgufPath.ts","../src/cli/utils/resolveHeaderFlag.ts","../src/cli/utils/resolveModelRecommendationFileOptions.ts","../src/cli/utils/splitAnsiToLines.ts","../src/cli/utils/withCliCommandDescriptionDocsUrl.ts","../src/evaluator/LlamaCompletion.ts","../src/evaluator/LlamaEmbedding.ts","../src/evaluator/LlamaEmbeddingContext.ts","../src/evaluator/LlamaGrammar.ts","../src/evaluator/LlamaGrammarEvaluationState.ts","../src/evaluator/LlamaJsonSchemaGrammar.ts","../src/evaluator/TokenBias.ts","../src/evaluator/TokenMeter.ts","../src/evaluator/LlamaChat/LlamaChat.ts","../src/evaluator/LlamaChat/utils/FunctionCallNameGrammar.ts","../src/evaluator/LlamaChat/utils/FunctionCallParamsGrammar.ts","../src/evaluator/LlamaChat/utils/LlamaFunctionCallValidationError.ts","../src/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.ts","../src/evaluator/LlamaChatSession/LlamaChatSession.ts","../src/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.ts","../src/evaluator/LlamaChatSession/utils/defineChatSessionFunction.ts","../src/evaluator/LlamaContext/LlamaContext.ts","../src/evaluator/LlamaContext/LlamaSampler.ts","../src/evaluator/LlamaContext/types.ts","../src/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizationStrategy.ts","../src/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/firstInFirstOutStrategy.ts","../src/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/maximumParallelismStrategy.ts","../src/evaluator/LlamaModel/LlamaModel.ts","../src/evaluator/LlamaModel/utils/TokenAttributes.ts","../src/gguf/consts.ts","../src/gguf/readGgufFileInfo.ts","../src/gguf/errors/InvalidGgufMagicError.ts","../src/gguf/errors/UnsupportedGgufValueTypeError.ts","../src/gguf/fileReaders/GgufFileReader.ts","../src/gguf/fileReaders/GgufFsFileReader.ts","../src/gguf/fileReaders/GgufNetworkFetchFileReader.ts","../src/gguf/insights/GgufInsights.ts","../src/gguf/insights/GgufInsightsConfigurationResolver.ts","../src/gguf/insights/utils/getRamUsageFromUnifiedVram.ts","../src/gguf/insights/utils/resolveContextContextSizeOption.ts","../src/gguf/insights/utils/resolveModelGpuLayersOption.ts","../src/gguf/insights/utils/scoreLevels.ts","../src/gguf/parser/GgufV2Parser.ts","../src/gguf/parser/GgufV3Parser.ts","../src/gguf/parser/parseGguf.ts","../src/gguf/types/GgufFileInfoTypes.ts","../src/gguf/types/GgufMetadataTypes.ts","../src/gguf/types/GgufTensorInfoTypes.ts","../src/gguf/utils/GgufReadOffset.ts","../src/gguf/utils/convertMetadataKeyValueRecordToNestedObject.ts","../src/gguf/utils/getGgufFileTypeName.ts","../src/gguf/utils/getGgufMetadataArchitectureData.ts","../src/gguf/utils/getGgufMetadataKeyValue.ts","../src/gguf/utils/normalizeGgufDownloadUrl.ts","../src/gguf/utils/resolveBinarySplitGgufPartUrls.ts","../src/gguf/utils/resolveSplitGgufParts.ts","../src/utils/DisposeGuard.ts","../src/utils/InsufficientMemoryError.ts","../src/utils/LlamaText.ts","../src/utils/LruCache.ts","../src/utils/OverridesObject.ts","../src/utils/ReplHistory.ts","../src/utils/StopGenerationDetector.ts","../src/utils/ThreadsSplitter.ts","../src/utils/TokenStreamRegulator.ts","../src/utils/UnsupportedError.ts","../src/utils/appendUserMessageToChatHistory.ts","../src/utils/clearTempFolder.ts","../src/utils/cmake.ts","../src/utils/compareTokens.ts","../src/utils/createModelDownloader.ts","../src/utils/findBestOption.ts","../src/utils/findCharacterRemovalCountToFitChatHistoryInContext.ts","../src/utils/getBuildDefaults.ts","../src/utils/getConsoleLogPrefix.ts","../src/utils/getGrammarsFolder.ts","../src/utils/getLlamaClasses.ts","../src/utils/getModuleVersion.ts","../src/utils/getQueuedTokensBeforeStopTrigger.ts","../src/utils/getReadableContextSize.ts","../src/utils/getTypeScriptTypeStringForGbnfJsonSchema.ts","../src/utils/gitReleaseBundles.ts","../src/utils/hashString.ts","../src/utils/isLockfileActive.ts","../src/utils/isToken.ts","../src/utils/isUrl.ts","../src/utils/mergeUnionTypes.ts","../src/utils/modelFileAccesTokens.ts","../src/utils/parseModelFileName.ts","../src/utils/parseModelUri.ts","../src/utils/parseTextTemplate.ts","../src/utils/prettyPrintObject.ts","../src/utils/pushAll.ts","../src/utils/removeNullFields.ts","../src/utils/resolveGithubRelease.ts","../src/utils/resolveLastTokens.ts","../src/utils/resolveModelDestination.ts","../src/utils/resolveModelFile.ts","../src/utils/runtime.ts","../src/utils/safeEventCallback.ts","../src/utils/spawnCommand.ts","../src/utils/tokenizeInput.ts","../src/utils/transformPromisable.ts","../src/utils/truncateTextAndRoundToWords.ts","../src/utils/utilTypes.ts","../src/utils/waitForLockfileRelease.ts","../src/utils/withLockfile.ts","../src/utils/withOra.ts","../src/utils/withProgressLog.ts","../src/utils/withStatusLogs.ts","../src/utils/wrapAbortSignal.ts","../src/utils/gbnfJson/GbnfGrammarGenerator.ts","../src/utils/gbnfJson/GbnfTerminal.ts","../src/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.ts","../src/utils/gbnfJson/types.ts","../src/utils/gbnfJson/terminals/GbnfArray.ts","../src/utils/gbnfJson/terminals/GbnfBoolean.ts","../src/utils/gbnfJson/terminals/GbnfBooleanValue.ts","../src/utils/gbnfJson/terminals/GbnfGrammar.ts","../src/utils/gbnfJson/terminals/GbnfNull.ts","../src/utils/gbnfJson/terminals/GbnfNumber.ts","../src/utils/gbnfJson/terminals/GbnfNumberValue.ts","../src/utils/gbnfJson/terminals/GbnfObjectMap.ts","../src/utils/gbnfJson/terminals/GbnfOr.ts","../src/utils/gbnfJson/terminals/GbnfRepetition.ts","../src/utils/gbnfJson/terminals/GbnfString.ts","../src/utils/gbnfJson/terminals/GbnfStringValue.ts","../src/utils/gbnfJson/terminals/GbnfVerbatimText.ts","../src/utils/gbnfJson/terminals/GbnfWhitespace.ts","../src/utils/gbnfJson/terminals/gbnfConsts.ts","../src/utils/gbnfJson/utils/GbnfJsonScopeState.ts","../src/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.ts","../src/utils/gbnfJson/utils/getGbnfJsonTerminalForLiteral.ts","../src/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.ts"],"version":"5.6.3"}
1
+ {"root":["../src/index.ts","../src/ChatWrapper.ts","../src/apiDocsIndex.ts","../src/commands.ts","../src/config.ts","../src/consts.ts","../src/state.ts","../src/types.ts","../src/bindings/AddonTypes.ts","../src/bindings/Llama.ts","../src/bindings/consts.ts","../src/bindings/getLlama.ts","../src/bindings/types.ts","../src/bindings/utils/MemoryOrchestrator.ts","../src/bindings/utils/NoBinaryFoundError.ts","../src/bindings/utils/asyncEvery.ts","../src/bindings/utils/asyncSome.ts","../src/bindings/utils/binariesGithubRelease.ts","../src/bindings/utils/clearAllLocalBuilds.ts","../src/bindings/utils/cloneLlamaCppRepo.ts","../src/bindings/utils/compileLLamaCpp.ts","../src/bindings/utils/detectAvailableComputeLayers.ts","../src/bindings/utils/detectGlibc.ts","../src/bindings/utils/getBestComputeLayersAvailable.ts","../src/bindings/utils/getBuildFolderNameForBuildOptions.ts","../src/bindings/utils/getCanUsePrebuiltBinaries.ts","../src/bindings/utils/getExampleUsageCodeOfGetLlama.ts","../src/bindings/utils/getGpuTypesToUseForOption.ts","../src/bindings/utils/getLinuxDistroInfo.ts","../src/bindings/utils/getLlamaWithoutBackend.ts","../src/bindings/utils/getPlatform.ts","../src/bindings/utils/getPlatformInfo.ts","../src/bindings/utils/hasBuildingFromSourceDependenciesInstalled.ts","../src/bindings/utils/hasFileInPath.ts","../src/bindings/utils/lastBuildInfo.ts","../src/bindings/utils/logBinaryUsageExampleToConsole.ts","../src/bindings/utils/logDistroInstallInstruction.ts","../src/bindings/utils/resolveCustomCmakeOptions.ts","../src/bindings/utils/testBindingBinary.ts","../src/bindings/utils/testCmakeBinary.ts","../src/chatWrappers/AlpacaChatWrapper.ts","../src/chatWrappers/ChatMLChatWrapper.ts","../src/chatWrappers/EmptyChatWrapper.ts","../src/chatWrappers/FalconChatWrapper.ts","../src/chatWrappers/FunctionaryChatWrapper.ts","../src/chatWrappers/GemmaChatWrapper.ts","../src/chatWrappers/GeneralChatWrapper.ts","../src/chatWrappers/Llama2ChatWrapper.ts","../src/chatWrappers/Llama3ChatWrapper.ts","../src/chatWrappers/Llama3_1ChatWrapper.ts","../src/chatWrappers/Llama3_2LightweightChatWrapper.ts","../src/chatWrappers/MistralChatWrapper.ts","../src/chatWrappers/generic/JinjaTemplateChatWrapper.ts","../src/chatWrappers/generic/TemplateChatWrapper.ts","../src/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.ts","../src/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.ts","../src/chatWrappers/utils/chunkChatItems.ts","../src/chatWrappers/utils/getModelLinageNames.ts","../src/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.ts","../src/chatWrappers/utils/isLlama3_2LightweightModel.ts","../src/chatWrappers/utils/jsonDumps.ts","../src/chatWrappers/utils/resolveChatWrapper.ts","../src/cli/cli.ts","../src/cli/projectTemplates.ts","../src/cli/recommendedModels.ts","../src/cli/startCreateCli.ts","../src/cli/commands/ChatCommand.ts","../src/cli/commands/CompleteCommand.ts","../src/cli/commands/DebugCommand.ts","../src/cli/commands/InfillCommand.ts","../src/cli/commands/InitCommand.ts","../src/cli/commands/OnPostInstallCommand.ts","../src/cli/commands/PullCommand.ts","../src/cli/commands/inspect/InspectCommand.ts","../src/cli/commands/inspect/commands/InspectEstimateCommand.ts","../src/cli/commands/inspect/commands/InspectGgufCommand.ts","../src/cli/commands/inspect/commands/InspectGpuCommand.ts","../src/cli/commands/inspect/commands/InspectMeasureCommand.ts","../src/cli/commands/source/SourceCommand.ts","../src/cli/commands/source/commands/BuildCommand.ts","../src/cli/commands/source/commands/ClearCommand.ts","../src/cli/commands/source/commands/DownloadCommand.ts","../src/cli/utils/ConsoleInteraction.ts","../src/cli/utils/ConsoleTable.ts","../src/cli/utils/basicChooseFromListConsoleInteraction.ts","../src/cli/utils/consolePromptQuestion.ts","../src/cli/utils/getReadablePath.ts","../src/cli/utils/interactivelyAskForModel.ts","../src/cli/utils/logUsedGpuTypeOption.ts","../src/cli/utils/printCommonInfoLines.ts","../src/cli/utils/printInfoLine.ts","../src/cli/utils/printModelDestination.ts","../src/cli/utils/projectTemplates.ts","../src/cli/utils/renderModelCompatibilityPercentageWithColors.ts","../src/cli/utils/resolveCommandGgufPath.ts","../src/cli/utils/resolveHeaderFlag.ts","../src/cli/utils/resolveModelRecommendationFileOptions.ts","../src/cli/utils/splitAnsiToLines.ts","../src/cli/utils/withCliCommandDescriptionDocsUrl.ts","../src/evaluator/LlamaCompletion.ts","../src/evaluator/LlamaEmbedding.ts","../src/evaluator/LlamaEmbeddingContext.ts","../src/evaluator/LlamaGrammar.ts","../src/evaluator/LlamaGrammarEvaluationState.ts","../src/evaluator/LlamaJsonSchemaGrammar.ts","../src/evaluator/TokenBias.ts","../src/evaluator/TokenMeter.ts","../src/evaluator/LlamaChat/LlamaChat.ts","../src/evaluator/LlamaChat/utils/FunctionCallNameGrammar.ts","../src/evaluator/LlamaChat/utils/FunctionCallParamsGrammar.ts","../src/evaluator/LlamaChat/utils/LlamaFunctionCallValidationError.ts","../src/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.ts","../src/evaluator/LlamaChatSession/LlamaChatSession.ts","../src/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.ts","../src/evaluator/LlamaChatSession/utils/defineChatSessionFunction.ts","../src/evaluator/LlamaContext/LlamaContext.ts","../src/evaluator/LlamaContext/LlamaSampler.ts","../src/evaluator/LlamaContext/types.ts","../src/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizationStrategy.ts","../src/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/firstInFirstOutStrategy.ts","../src/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/maximumParallelismStrategy.ts","../src/evaluator/LlamaModel/LlamaModel.ts","../src/evaluator/LlamaModel/utils/TokenAttributes.ts","../src/gguf/consts.ts","../src/gguf/readGgufFileInfo.ts","../src/gguf/errors/InvalidGgufMagicError.ts","../src/gguf/errors/UnsupportedGgufValueTypeError.ts","../src/gguf/fileReaders/GgufFileReader.ts","../src/gguf/fileReaders/GgufFsFileReader.ts","../src/gguf/fileReaders/GgufNetworkFetchFileReader.ts","../src/gguf/insights/GgufInsights.ts","../src/gguf/insights/GgufInsightsConfigurationResolver.ts","../src/gguf/insights/utils/getRamUsageFromUnifiedVram.ts","../src/gguf/insights/utils/resolveContextContextSizeOption.ts","../src/gguf/insights/utils/resolveModelGpuLayersOption.ts","../src/gguf/insights/utils/scoreLevels.ts","../src/gguf/parser/GgufV2Parser.ts","../src/gguf/parser/GgufV3Parser.ts","../src/gguf/parser/parseGguf.ts","../src/gguf/types/GgufFileInfoTypes.ts","../src/gguf/types/GgufMetadataTypes.ts","../src/gguf/types/GgufTensorInfoTypes.ts","../src/gguf/utils/GgufReadOffset.ts","../src/gguf/utils/convertMetadataKeyValueRecordToNestedObject.ts","../src/gguf/utils/getGgufFileTypeName.ts","../src/gguf/utils/getGgufMetadataArchitectureData.ts","../src/gguf/utils/getGgufMetadataKeyValue.ts","../src/gguf/utils/normalizeGgufDownloadUrl.ts","../src/gguf/utils/resolveBinarySplitGgufPartUrls.ts","../src/gguf/utils/resolveSplitGgufParts.ts","../src/utils/DisposeGuard.ts","../src/utils/InsufficientMemoryError.ts","../src/utils/LlamaText.ts","../src/utils/LruCache.ts","../src/utils/OverridesObject.ts","../src/utils/ReplHistory.ts","../src/utils/StopGenerationDetector.ts","../src/utils/ThreadsSplitter.ts","../src/utils/TokenStreamRegulator.ts","../src/utils/UnsupportedError.ts","../src/utils/appendUserMessageToChatHistory.ts","../src/utils/clearTempFolder.ts","../src/utils/cmake.ts","../src/utils/compareTokens.ts","../src/utils/createModelDownloader.ts","../src/utils/findBestOption.ts","../src/utils/findCharacterRemovalCountToFitChatHistoryInContext.ts","../src/utils/getBuildDefaults.ts","../src/utils/getConsoleLogPrefix.ts","../src/utils/getGrammarsFolder.ts","../src/utils/getLlamaClasses.ts","../src/utils/getModuleVersion.ts","../src/utils/getQueuedTokensBeforeStopTrigger.ts","../src/utils/getReadableContextSize.ts","../src/utils/getTypeScriptTypeStringForGbnfJsonSchema.ts","../src/utils/gitReleaseBundles.ts","../src/utils/hashString.ts","../src/utils/includesText.ts","../src/utils/isLockfileActive.ts","../src/utils/isToken.ts","../src/utils/isUrl.ts","../src/utils/mergeUnionTypes.ts","../src/utils/modelFileAccesTokens.ts","../src/utils/parseModelFileName.ts","../src/utils/parseModelUri.ts","../src/utils/parseTextTemplate.ts","../src/utils/prettyPrintObject.ts","../src/utils/pushAll.ts","../src/utils/removeNullFields.ts","../src/utils/resolveGithubRelease.ts","../src/utils/resolveLastTokens.ts","../src/utils/resolveModelDestination.ts","../src/utils/resolveModelFile.ts","../src/utils/runtime.ts","../src/utils/safeEventCallback.ts","../src/utils/spawnCommand.ts","../src/utils/tokenizeInput.ts","../src/utils/transformPromisable.ts","../src/utils/truncateTextAndRoundToWords.ts","../src/utils/utilTypes.ts","../src/utils/waitForLockfileRelease.ts","../src/utils/withLockfile.ts","../src/utils/withOra.ts","../src/utils/withProgressLog.ts","../src/utils/withStatusLogs.ts","../src/utils/wrapAbortSignal.ts","../src/utils/gbnfJson/GbnfGrammarGenerator.ts","../src/utils/gbnfJson/GbnfTerminal.ts","../src/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.ts","../src/utils/gbnfJson/types.ts","../src/utils/gbnfJson/terminals/GbnfAnyJson.ts","../src/utils/gbnfJson/terminals/GbnfArray.ts","../src/utils/gbnfJson/terminals/GbnfBoolean.ts","../src/utils/gbnfJson/terminals/GbnfBooleanValue.ts","../src/utils/gbnfJson/terminals/GbnfCommaWhitespace.ts","../src/utils/gbnfJson/terminals/GbnfFormatString.ts","../src/utils/gbnfJson/terminals/GbnfGrammar.ts","../src/utils/gbnfJson/terminals/GbnfInsideStringChar.ts","../src/utils/gbnfJson/terminals/GbnfNull.ts","../src/utils/gbnfJson/terminals/GbnfNumber.ts","../src/utils/gbnfJson/terminals/GbnfNumberValue.ts","../src/utils/gbnfJson/terminals/GbnfObjectMap.ts","../src/utils/gbnfJson/terminals/GbnfOr.ts","../src/utils/gbnfJson/terminals/GbnfRepetition.ts","../src/utils/gbnfJson/terminals/GbnfString.ts","../src/utils/gbnfJson/terminals/GbnfStringValue.ts","../src/utils/gbnfJson/terminals/GbnfVerbatimText.ts","../src/utils/gbnfJson/terminals/GbnfWhitespace.ts","../src/utils/gbnfJson/terminals/gbnfConsts.ts","../src/utils/gbnfJson/utils/GbnfJsonScopeState.ts","../src/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.ts","../src/utils/gbnfJson/utils/getGbnfJsonTerminalForLiteral.ts","../src/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.ts"],"version":"5.7.2"}
package/dist/types.d.ts CHANGED
@@ -126,7 +126,7 @@ export type ChatModelFunctionCall = {
126
126
  export type ChatModelFunctions = {
127
127
  readonly [name: string]: {
128
128
  readonly description?: string;
129
- readonly params?: GbnfJsonSchema | undefined | null;
129
+ readonly params?: Readonly<GbnfJsonSchema> | undefined | null;
130
130
  };
131
131
  };
132
132
  export type ChatSessionModelFunctions = {
@@ -134,7 +134,7 @@ export type ChatSessionModelFunctions = {
134
134
  };
135
135
  export type ChatSessionModelFunction<Params extends GbnfJsonSchema | undefined = GbnfJsonSchema | undefined> = {
136
136
  readonly description?: string;
137
- readonly params?: Params;
137
+ readonly params?: Readonly<Params>;
138
138
  readonly handler: (params: GbnfJsonSchemaToType<Params>) => any;
139
139
  };
140
140
  export declare function isChatModelResponseFunctionCall(item: ChatModelResponse["response"][number]): item is ChatModelFunctionCall;
@@ -1,6 +1,11 @@
1
1
  export declare class GbnfGrammarGenerator {
2
2
  rules: Map<string, string | null>;
3
+ ruleContentToRuleName: Map<string, string>;
4
+ literalValueRuleNames: Map<string | number, string>;
3
5
  private ruleId;
6
+ private valueRuleId;
4
7
  generateRuleName(): string;
8
+ generateRuleNameForLiteralValue(value: string | number): string;
5
9
  generateGbnfFile(rootGrammar: string): string;
10
+ getProposedLiteralValueRuleNameLength(): number;
6
11
  }
@@ -1,11 +1,23 @@
1
1
  export class GbnfGrammarGenerator {
2
2
  rules = new Map();
3
+ ruleContentToRuleName = new Map();
4
+ literalValueRuleNames = new Map();
3
5
  ruleId = 0;
6
+ valueRuleId = 0;
4
7
  generateRuleName() {
5
8
  const ruleId = this.ruleId;
6
9
  this.ruleId++;
7
10
  return `rule${ruleId}`;
8
11
  }
12
+ generateRuleNameForLiteralValue(value) {
13
+ const existingRuleName = this.literalValueRuleNames.get(value);
14
+ if (existingRuleName != null)
15
+ return existingRuleName;
16
+ const ruleName = `val${this.valueRuleId}`;
17
+ this.valueRuleId++;
18
+ this.literalValueRuleNames.set(value, ruleName);
19
+ return ruleName;
20
+ }
9
21
  generateGbnfFile(rootGrammar) {
10
22
  const rules = [{
11
23
  name: "root",
@@ -23,5 +35,8 @@ export class GbnfGrammarGenerator {
23
35
  const gbnf = ruleStrings.join("\n");
24
36
  return gbnf;
25
37
  }
38
+ getProposedLiteralValueRuleNameLength() {
39
+ return `val${this.valueRuleId}`.length;
40
+ }
26
41
  }
27
42
  //# sourceMappingURL=GbnfGrammarGenerator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"GbnfGrammarGenerator.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfGrammarGenerator.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAoB;IACtB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IACxC,MAAM,GAAW,CAAC,CAAC;IAEpB,gBAAgB;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,OAAO,OAAO,MAAM,EAAE,CAAC;IAC3B,CAAC;IAEM,gBAAgB,CAAC,WAAmB;QACvC,MAAM,KAAK,GAAsC,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,WAAW;aACvB,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,OAAO,IAAI,IAAI;gBACf,SAAS;YAEb,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,QAAQ;gBACd,OAAO;aACV,CAAC,CAAC;QACP,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
1
+ {"version":3,"file":"GbnfGrammarGenerator.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfGrammarGenerator.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAoB;IACtB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IACzC,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAClD,qBAAqB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC1D,MAAM,GAAW,CAAC,CAAC;IACnB,WAAW,GAAW,CAAC,CAAC;IAEzB,gBAAgB;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,OAAO,OAAO,MAAM,EAAE,CAAC;IAC3B,CAAC;IAEM,+BAA+B,CAAC,KAAsB;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,gBAAgB,IAAI,IAAI;YACxB,OAAO,gBAAgB,CAAC;QAE5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEhD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,gBAAgB,CAAC,WAAmB;QACvC,MAAM,KAAK,GAAsC,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,WAAW;aACvB,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,OAAO,IAAI,IAAI;gBACf,SAAS;YAEb,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,QAAQ;gBACd,OAAO;aACV,CAAC,CAAC;QACP,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,qCAAqC;QACxC,OAAO,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;IAC3C,CAAC;CACJ"}
@@ -1,7 +1,10 @@
1
1
  import { GbnfGrammarGenerator } from "./GbnfGrammarGenerator.js";
2
2
  export declare abstract class GbnfTerminal {
3
3
  private _ruleName;
4
+ /** To be used only by `getRuleName` */
5
+ protected generateRuleName(grammarGenerator: GbnfGrammarGenerator): string;
4
6
  protected getRuleName(grammarGenerator: GbnfGrammarGenerator): string;
5
7
  abstract getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
8
+ protected getGrammarFromResolve(grammarGenerator: GbnfGrammarGenerator): string;
6
9
  resolve(grammarGenerator: GbnfGrammarGenerator): string;
7
10
  }
@@ -1,16 +1,38 @@
1
1
  export class GbnfTerminal {
2
2
  _ruleName = null;
3
+ /** To be used only by `getRuleName` */
4
+ generateRuleName(grammarGenerator) {
5
+ return grammarGenerator.generateRuleName();
6
+ }
3
7
  getRuleName(grammarGenerator) {
4
8
  if (this._ruleName != null)
5
9
  return this._ruleName;
6
- const ruleName = grammarGenerator.generateRuleName();
10
+ const ruleName = this.generateRuleName(grammarGenerator);
7
11
  this._ruleName = ruleName;
8
12
  return ruleName;
9
13
  }
14
+ getGrammarFromResolve(grammarGenerator) {
15
+ return this.getGrammar(grammarGenerator);
16
+ }
10
17
  resolve(grammarGenerator) {
18
+ if (this._ruleName != null)
19
+ return this._ruleName;
20
+ const grammar = this.getGrammarFromResolve(grammarGenerator);
21
+ const existingRuleName = grammarGenerator.ruleContentToRuleName.get(grammar);
22
+ if (existingRuleName != null) {
23
+ this._ruleName = existingRuleName;
24
+ return existingRuleName;
25
+ }
11
26
  const ruleName = this.getRuleName(grammarGenerator);
12
- if (!grammarGenerator.rules.has(ruleName))
13
- grammarGenerator.rules.set(ruleName, this.getGrammar(grammarGenerator));
27
+ if (grammar === ruleName) {
28
+ this._ruleName = ruleName;
29
+ return ruleName;
30
+ }
31
+ if (!grammarGenerator.rules.has(ruleName)) {
32
+ grammarGenerator.rules.set(ruleName, grammar);
33
+ grammarGenerator.ruleContentToRuleName.set(grammar, ruleName);
34
+ }
35
+ this._ruleName = ruleName;
14
36
  return ruleName;
15
37
  }
16
38
  }
@@ -1 +1 @@
1
- {"version":3,"file":"GbnfTerminal.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfTerminal.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,YAAY;IACtB,SAAS,GAAkB,IAAI,CAAC;IAE9B,WAAW,CAAC,gBAAsC;QACxD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,OAAO,QAAQ,CAAC;IACpB,CAAC;IAIM,OAAO,CAAC,gBAAsC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;YACrC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAE5E,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}
1
+ {"version":3,"file":"GbnfTerminal.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfTerminal.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,YAAY;IACtB,SAAS,GAAkB,IAAI,CAAC;IAExC,uCAAuC;IAC7B,gBAAgB,CAAC,gBAAsC;QAC7D,OAAO,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;IAC/C,CAAC;IAES,WAAW,CAAC,gBAAsC;QACxD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,OAAO,QAAQ,CAAC;IACpB,CAAC;IAIS,qBAAqB,CAAC,gBAAsC;QAClE,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;IAEM,OAAO,CAAC,gBAAsC;QACjD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;QAE7D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7E,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC;YAClC,OAAO,gBAAgB,CAAC;QAC5B,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpD,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC1B,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9C,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}
@@ -1,5 +1,5 @@
1
1
  import { GbnfJsonSchema } from "./types.js";
2
- export declare function getGbnfGrammarForGbnfJsonSchema(schema: GbnfJsonSchema, { allowNewLines, scopePadSpaces }?: {
2
+ export declare function getGbnfGrammarForGbnfJsonSchema(schema: Readonly<GbnfJsonSchema>, { allowNewLines, scopePadSpaces }?: {
3
3
  allowNewLines?: boolean;
4
4
  scopePadSpaces?: number;
5
5
  }): string;
@@ -1 +1 @@
1
- {"version":3,"file":"getGbnfGrammarForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oCAAoC,EAAC,MAAM,iDAAiD,CAAC;AACrG,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAGjE,MAAM,UAAU,+BAA+B,CAAC,MAAsB,EAAE,EACpE,aAAa,GAAG,IAAI,EACpB,cAAc,GAAG,CAAC,KAIlB,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC,EAAC,aAAa,EAAE,cAAc,EAAC,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,oCAAoC,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAChG,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAE9D,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,GAAG,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;AAChG,CAAC"}
1
+ {"version":3,"file":"getGbnfGrammarForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oCAAoC,EAAC,MAAM,iDAAiD,CAAC;AACrG,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAGjE,MAAM,UAAU,+BAA+B,CAAC,MAAgC,EAAE,EAC9E,aAAa,GAAG,IAAI,EACpB,cAAc,GAAG,CAAC,KAIlB,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC,EAAC,aAAa,EAAE,cAAc,EAAC,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,oCAAoC,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAChG,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAE9D,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,GAAG,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;AAChG,CAAC"}
@@ -0,0 +1,9 @@
1
+ import { GbnfTerminal } from "../GbnfTerminal.js";
2
+ import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
3
+ import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
4
+ export declare class GbnfAnyJson extends GbnfTerminal {
5
+ readonly scopeState: GbnfJsonScopeState;
6
+ constructor(scopeState?: GbnfJsonScopeState);
7
+ getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
8
+ protected getRuleName(): string;
9
+ }
@@ -0,0 +1,53 @@
1
+ import { GbnfTerminal } from "../GbnfTerminal.js";
2
+ import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
3
+ import { GbnfString } from "./GbnfString.js";
4
+ import { GbnfOr } from "./GbnfOr.js";
5
+ import { GbnfNumber } from "./GbnfNumber.js";
6
+ import { GbnfBoolean } from "./GbnfBoolean.js";
7
+ import { GbnfNull } from "./GbnfNull.js";
8
+ import { GbnfArray } from "./GbnfArray.js";
9
+ import { reservedRuleNames } from "./gbnfConsts.js";
10
+ import { GbnfObjectMap } from "./GbnfObjectMap.js";
11
+ export class GbnfAnyJson extends GbnfTerminal {
12
+ scopeState;
13
+ constructor(scopeState = new GbnfJsonScopeState()) {
14
+ super();
15
+ this.scopeState = scopeState;
16
+ }
17
+ getGrammar(grammarGenerator) {
18
+ const subAnyJsonScopeItem = this.scopeState.settings.allowNewLines
19
+ ? new GbnfAnyJson(new GbnfJsonScopeState({
20
+ allowNewLines: false,
21
+ scopePadSpaces: this.scopeState.settings.scopePadSpaces
22
+ }, this.scopeState.currentNestingScope))
23
+ : new GbnfSubAnyJson(this.scopeState);
24
+ return new GbnfOr([
25
+ new GbnfString(),
26
+ new GbnfNumber({ allowFractional: true }),
27
+ new GbnfBoolean(),
28
+ new GbnfNull(),
29
+ new GbnfArray({
30
+ items: subAnyJsonScopeItem,
31
+ scopeState: this.scopeState
32
+ }),
33
+ new GbnfObjectMap({
34
+ fields: [],
35
+ additionalProperties: subAnyJsonScopeItem,
36
+ scopeState: this.scopeState
37
+ })
38
+ ]).getGrammar(grammarGenerator);
39
+ }
40
+ getRuleName() {
41
+ return reservedRuleNames.anyJson({
42
+ allowNewLines: this.scopeState.settings.allowNewLines,
43
+ scopeSpaces: this.scopeState.settings.scopePadSpaces,
44
+ nestingScope: this.scopeState.currentNestingScope
45
+ });
46
+ }
47
+ }
48
+ class GbnfSubAnyJson extends GbnfAnyJson {
49
+ getGrammar() {
50
+ return this.getRuleName();
51
+ }
52
+ }
53
+ //# sourceMappingURL=GbnfAnyJson.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"GbnfAnyJson.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfAnyJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAGjD,MAAM,OAAO,WAAY,SAAQ,YAAY;IACzB,UAAU,CAAqB;IAE/C,YAAmB,aAAiC,IAAI,kBAAkB,EAAE;QACxE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa;YAC9D,CAAC,CAAC,IAAI,WAAW,CACb,IAAI,kBAAkB,CAAC;gBACnB,aAAa,EAAE,KAAK;gBACpB,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;aAC1D,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAC1C;YACD,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE1C,OAAO,IAAI,MAAM,CAAC;YACd,IAAI,UAAU,EAAE;YAChB,IAAI,UAAU,CAAC,EAAC,eAAe,EAAE,IAAI,EAAC,CAAC;YACvC,IAAI,WAAW,EAAE;YACjB,IAAI,QAAQ,EAAE;YACd,IAAI,SAAS,CAAC;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,UAAU,EAAE,IAAI,CAAC,UAAU;aAC9B,CAAC;YACF,IAAI,aAAa,CAAC;gBACd,MAAM,EAAE,EAAE;gBACV,oBAAoB,EAAE,mBAAmB;gBACzC,UAAU,EAAE,IAAI,CAAC,UAAU;aAC9B,CAAC;SACL,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,OAAO,CAAC;YAC7B,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa;YACrD,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;YACpD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,cAAe,SAAQ,WAAW;IACpB,UAAU;QACtB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;CACJ"}
@@ -2,8 +2,17 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
2
2
  import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
3
3
  import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
4
4
  export declare class GbnfArray extends GbnfTerminal {
5
- readonly items: GbnfTerminal;
5
+ readonly items?: GbnfTerminal;
6
+ readonly prefixItems?: GbnfTerminal[];
7
+ readonly minItems: number;
8
+ readonly maxItems?: number;
6
9
  readonly scopeState: GbnfJsonScopeState;
7
- constructor(items: GbnfTerminal, scopeState?: GbnfJsonScopeState);
10
+ constructor({ items, prefixItems, minItems, maxItems, scopeState }: {
11
+ items?: GbnfTerminal;
12
+ prefixItems?: GbnfTerminal[];
13
+ minItems?: number;
14
+ maxItems?: number;
15
+ scopeState: GbnfJsonScopeState;
16
+ });
8
17
  getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
9
18
  }
@@ -2,31 +2,80 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
2
2
  import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
3
3
  import { GbnfWhitespace } from "./GbnfWhitespace.js";
4
4
  import { GbnfGrammar } from "./GbnfGrammar.js";
5
- import { GbnfOr } from "./GbnfOr.js";
5
+ import { GbnfRepetition } from "./GbnfRepetition.js";
6
+ import { GbnfCommaWhitespace } from "./GbnfCommaWhitespace.js";
7
+ import { GbnfAnyJson } from "./GbnfAnyJson.js";
6
8
  export class GbnfArray extends GbnfTerminal {
7
9
  items;
10
+ prefixItems;
11
+ minItems;
12
+ maxItems;
8
13
  scopeState;
9
- constructor(items, scopeState = new GbnfJsonScopeState()) {
14
+ constructor({ items, prefixItems, minItems = 0, maxItems, scopeState = new GbnfJsonScopeState() }) {
10
15
  super();
11
16
  this.items = items;
17
+ this.prefixItems = prefixItems;
18
+ this.minItems = Math.floor(minItems);
19
+ this.maxItems = maxItems == null ? undefined : Math.floor(maxItems);
12
20
  this.scopeState = scopeState;
21
+ if (this.prefixItems != null && this.minItems < this.prefixItems.length)
22
+ this.minItems = this.prefixItems.length;
23
+ else if (this.minItems < 0)
24
+ this.minItems = 0;
25
+ if (this.maxItems != null && this.maxItems < this.minItems)
26
+ this.maxItems = this.minItems;
27
+ else if (this.maxItems != null && this.maxItems < 0)
28
+ this.maxItems = 0;
13
29
  }
14
30
  getGrammar(grammarGenerator) {
15
- const getWhitespaceRuleName = (newScope, newLine) => (newScope
16
- ? new GbnfWhitespace(this.scopeState.getForNewScope(), { newLine }).resolve(grammarGenerator)
17
- : new GbnfWhitespace(this.scopeState, { newLine }).resolve(grammarGenerator));
18
- const itemsGrammarRuleName = this.items.resolve(grammarGenerator);
31
+ const getWhitespaceRule = (newScope, newLine) => (newScope
32
+ ? new GbnfWhitespace(this.scopeState.getForNewScope(), { newLine })
33
+ : new GbnfWhitespace(this.scopeState, { newLine }));
34
+ const getWhitespaceRuleName = (newScope, newLine) => (getWhitespaceRule(newScope, newLine).resolve(grammarGenerator));
35
+ const getCommaWhitespaceRule = (newScope, newLine) => (newScope
36
+ ? new GbnfCommaWhitespace(this.scopeState.getForNewScope(), { newLine })
37
+ : new GbnfCommaWhitespace(this.scopeState, { newLine }));
38
+ const getCommaWhitespaceRuleName = (newScope, newLine) => (getCommaWhitespaceRule(newScope, newLine).resolve(grammarGenerator));
39
+ const arrayItemsGrammar = [];
40
+ if (this.prefixItems != null && this.prefixItems.length > 0) {
41
+ for (const item of this.prefixItems) {
42
+ if (arrayItemsGrammar.length > 0)
43
+ arrayItemsGrammar.push(getCommaWhitespaceRuleName(true, "before"));
44
+ arrayItemsGrammar.push(item.resolve(grammarGenerator));
45
+ }
46
+ if (this.minItems > this.prefixItems.length || this.maxItems == null || this.maxItems > this.prefixItems.length) {
47
+ const restMinRepetitions = this.minItems - this.prefixItems.length;
48
+ const restMaxRepetitions = this.maxItems == null
49
+ ? undefined
50
+ : this.maxItems - this.prefixItems.length;
51
+ if (arrayItemsGrammar.length > 0)
52
+ arrayItemsGrammar.push(new GbnfRepetition({
53
+ value: new GbnfGrammar([
54
+ getCommaWhitespaceRuleName(true, "before"),
55
+ (this.items ?? new GbnfAnyJson()).resolve(grammarGenerator)
56
+ ], true),
57
+ minRepetitions: restMinRepetitions,
58
+ maxRepetitions: restMaxRepetitions
59
+ }).getGrammar(grammarGenerator));
60
+ else
61
+ arrayItemsGrammar.push(new GbnfRepetition({
62
+ value: this.items ?? new GbnfAnyJson(),
63
+ separator: getCommaWhitespaceRule(true, "before"),
64
+ minRepetitions: restMinRepetitions,
65
+ maxRepetitions: restMaxRepetitions
66
+ }).getGrammar(grammarGenerator));
67
+ }
68
+ }
69
+ else
70
+ arrayItemsGrammar.push(new GbnfRepetition({
71
+ value: this.items ?? new GbnfAnyJson(),
72
+ separator: getCommaWhitespaceRule(true, "before"),
73
+ minRepetitions: this.minItems,
74
+ maxRepetitions: this.maxItems
75
+ }).getGrammar(grammarGenerator));
19
76
  return new GbnfGrammar([
20
77
  '"["', getWhitespaceRuleName(true, "before"),
21
- new GbnfOr([
22
- new GbnfGrammar([
23
- "(", itemsGrammarRuleName, ")",
24
- "(", '","', getWhitespaceRuleName(true, "before"), itemsGrammarRuleName, ")*"
25
- ]),
26
- new GbnfGrammar([
27
- "(", itemsGrammarRuleName, ")?"
28
- ])
29
- ]).getGrammar(grammarGenerator),
78
+ new GbnfGrammar(arrayItemsGrammar).getGrammar(),
30
79
  getWhitespaceRuleName(false, "before"), '"]"'
31
80
  ]).getGrammar();
32
81
  }
@@ -1 +1 @@
1
- {"version":3,"file":"GbnfArray.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfArray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,SAAU,SAAQ,YAAY;IACvB,KAAK,CAAe;IACpB,UAAU,CAAqB;IAE/C,YAAmB,KAAmB,EAAE,aAAiC,IAAI,kBAAkB,EAAE;QAC7F,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAE,OAAmC,EAAE,EAAE,CAAC,CACtF,QAAQ;YACJ,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC3F,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CACjF,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAElE,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC5C,IAAI,MAAM,CAAC;gBACP,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,GAAG;oBAC9B,GAAG,EAAE,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,oBAAoB,EAAE,IAAI;iBAChF,CAAC;gBACF,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,IAAI;iBAClC,CAAC;aACL,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAC/B,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,KAAK;SAChD,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ"}
1
+ {"version":3,"file":"GbnfArray.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfArray.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { GbnfTerminal } from "../GbnfTerminal.js";
2
- import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
3
2
  export declare class GbnfBoolean extends GbnfTerminal {
4
- getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
3
+ getGrammar(): string;
4
+ protected getGrammarFromResolve(): string;
5
+ private _getGrammar;
5
6
  protected getRuleName(): string;
6
7
  }
@@ -1,13 +1,19 @@
1
1
  import { GbnfTerminal } from "../GbnfTerminal.js";
2
- import { GbnfOr } from "./GbnfOr.js";
3
- import { GbnfGrammar } from "./GbnfGrammar.js";
4
2
  import { reservedRuleNames } from "./gbnfConsts.js";
5
3
  export class GbnfBoolean extends GbnfTerminal {
6
- getGrammar(grammarGenerator) {
7
- return new GbnfOr([
8
- new GbnfGrammar('"true"'),
9
- new GbnfGrammar('"false"')
10
- ]).getGrammar(grammarGenerator);
4
+ getGrammar() {
5
+ return this._getGrammar();
6
+ }
7
+ getGrammarFromResolve() {
8
+ return this._getGrammar(false);
9
+ }
10
+ _getGrammar(wrap = true) {
11
+ const values = ['"true"', '"false"'];
12
+ if (wrap)
13
+ return [
14
+ "(", values.join(" | "), ")"
15
+ ].join(" ");
16
+ return values.join(" | ");
11
17
  }
12
18
  getRuleName() {
13
19
  return reservedRuleNames.boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"GbnfBoolean.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfBoolean.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,WAAY,SAAQ,YAAY;IAClC,UAAU,CAAC,gBAAsC;QACpD,OAAO,IAAI,MAAM,CAAC;YACd,IAAI,WAAW,CAAC,QAAQ,CAAC;YACzB,IAAI,WAAW,CAAC,SAAS,CAAC;SAC7B,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,OAAO,CAAC;IACrC,CAAC;CACJ"}
1
+ {"version":3,"file":"GbnfBoolean.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfBoolean.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,WAAY,SAAQ,YAAY;IAClC,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;IAEkB,qBAAqB;QACpC,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAEO,WAAW,CAAC,OAAgB,IAAI;QACpC,MAAM,MAAM,GAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAE/C,IAAI,IAAI;YACJ,OAAO;gBACH,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG;aAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhB,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,OAAO,CAAC;IACrC,CAAC;CACJ"}
@@ -0,0 +1,11 @@
1
+ import { GbnfTerminal } from "../GbnfTerminal.js";
2
+ import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
3
+ export declare class GbnfCommaWhitespace extends GbnfTerminal {
4
+ readonly scopeState: GbnfJsonScopeState;
5
+ readonly newLine: "before" | "after" | false;
6
+ constructor(scopeState: GbnfJsonScopeState, { newLine }?: {
7
+ newLine?: "before" | "after" | false;
8
+ });
9
+ getGrammar(): string;
10
+ protected getRuleName(): string;
11
+ }
@@ -0,0 +1,28 @@
1
+ import { GbnfTerminal } from "../GbnfTerminal.js";
2
+ import { GbnfGrammar } from "./GbnfGrammar.js";
3
+ import { GbnfWhitespace } from "./GbnfWhitespace.js";
4
+ import { reservedRuleNames } from "./gbnfConsts.js";
5
+ export class GbnfCommaWhitespace extends GbnfTerminal {
6
+ scopeState;
7
+ newLine;
8
+ constructor(scopeState, { newLine = "before" } = {}) {
9
+ super();
10
+ this.scopeState = scopeState;
11
+ this.newLine = newLine;
12
+ }
13
+ getGrammar() {
14
+ return new GbnfGrammar([
15
+ '","', new GbnfWhitespace(this.scopeState, { newLine: this.newLine }).getGrammar()
16
+ ]).getGrammar();
17
+ }
18
+ getRuleName() {
19
+ return reservedRuleNames.commaWhitespace({
20
+ newLine: this.scopeState.settings.allowNewLines
21
+ ? this.newLine
22
+ : false,
23
+ scopeSpaces: this.scopeState.settings.scopePadSpaces,
24
+ nestingScope: this.scopeState.currentNestingScope
25
+ });
26
+ }
27
+ }
28
+ //# sourceMappingURL=GbnfCommaWhitespace.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"GbnfCommaWhitespace.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfCommaWhitespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,mBAAoB,SAAQ,YAAY;IACjC,UAAU,CAAqB;IAC/B,OAAO,CAA6B;IAEpD,YAAmB,UAA8B,EAAE,EAC/C,OAAO,GAAG,QAAQ,KAGlB,EAAE;QACF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAC,CAAC,CAAC,UAAU,EAAE;SACnF,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,eAAe,CAAC;YACrC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa;gBAC3C,CAAC,CAAC,IAAI,CAAC,OAAO;gBACd,CAAC,CAAC,KAAK;YACX,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;YACpD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ"}
@@ -0,0 +1,11 @@
1
+ import { GbnfTerminal } from "../GbnfTerminal.js";
2
+ import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
3
+ import { GbnfJsonFormatStringSchema } from "../types.js";
4
+ export declare class GbnfFormatString extends GbnfTerminal {
5
+ readonly format: GbnfJsonFormatStringSchema["format"];
6
+ constructor(format: GbnfJsonFormatStringSchema["format"]);
7
+ getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
8
+ protected getRuleName(): string;
9
+ private _getDateGrammar;
10
+ private _getTimeGrammar;
11
+ }
@@ -0,0 +1,90 @@
1
+ import { GbnfTerminal } from "../GbnfTerminal.js";
2
+ import { reservedRuleNames } from "./gbnfConsts.js";
3
+ import { GbnfGrammar } from "./GbnfGrammar.js";
4
+ import { GbnfString } from "./GbnfString.js";
5
+ export class GbnfFormatString extends GbnfTerminal {
6
+ format;
7
+ constructor(format) {
8
+ super();
9
+ this.format = format;
10
+ }
11
+ getGrammar(grammarGenerator) {
12
+ const quote = '"\\""';
13
+ if (this.format === "date")
14
+ return new GbnfGrammar([
15
+ quote,
16
+ this._getDateGrammar(),
17
+ quote
18
+ ]).getGrammar();
19
+ else if (this.format === "time") {
20
+ return new GbnfGrammar([
21
+ quote,
22
+ this._getTimeGrammar(),
23
+ quote
24
+ ]).getGrammar();
25
+ }
26
+ else if (this.format === "date-time")
27
+ return new GbnfGrammar([
28
+ quote,
29
+ this._getDateGrammar(),
30
+ '"T"',
31
+ this._getTimeGrammar(),
32
+ quote
33
+ ]).getGrammar();
34
+ return new GbnfString({
35
+ minLength: 0,
36
+ maxLength: 0
37
+ }).resolve(grammarGenerator);
38
+ }
39
+ getRuleName() {
40
+ return reservedRuleNames.formatString(this.format);
41
+ }
42
+ _getDateGrammar() {
43
+ return new GbnfGrammar([
44
+ "[0-9]{4}",
45
+ '"-"',
46
+ or([
47
+ '"0" [1-9]',
48
+ '"1" [012]'
49
+ ]),
50
+ '"-"',
51
+ or([
52
+ '"0" [1-9]',
53
+ "[12] [0-9]",
54
+ '"3" [01]'
55
+ ])
56
+ ]).getGrammar();
57
+ }
58
+ _getTimeGrammar() {
59
+ return new GbnfGrammar([
60
+ or([
61
+ "[01] [0-9]",
62
+ '"2" [0-3]'
63
+ ]),
64
+ '":"',
65
+ "[0-5] [0-9]",
66
+ '":"',
67
+ "[0-5] [0-9]",
68
+ '( "." [0-9]{3} )?',
69
+ or([
70
+ '"Z"',
71
+ new GbnfGrammar([
72
+ or([
73
+ '"+"',
74
+ '"-"'
75
+ ]),
76
+ or([
77
+ "[01] [0-9]",
78
+ '"2" [0-3]'
79
+ ]),
80
+ '":"',
81
+ "[0-5] [0-9]"
82
+ ]).getGrammar()
83
+ ])
84
+ ]).getGrammar();
85
+ }
86
+ }
87
+ function or(values) {
88
+ return "(" + values.join(" | ") + ")";
89
+ }
90
+ //# sourceMappingURL=GbnfFormatString.js.map