@fontoxml/fontoxml-development-tools 3.7.0-beta.7 → 3.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/{.eslintrc.js → .eslintrc.cjs} +0 -0
- package/{.prettierrc.js → .prettierrc.cjs} +0 -0
- package/bin/development-tools.js +8 -8
- package/index.js +4 -6
- package/npm-shrinkwrap.json +938 -5226
- package/package.json +2 -1
- package/src/App.js +60 -36
- package/src/AssertableWritableStream.js +4 -9
- package/src/ConfigManager.js +3 -7
- package/src/EditorRepository.js +15 -16
- package/src/FdtCommand.js +12 -33
- package/src/FdtLicense.js +8 -14
- package/src/FdtTable.js +4 -8
- package/src/ModuleRegistrationApi.js +14 -12
- package/src/addCoreModulesToApp.js +7 -5
- package/src/addModulesToApp.js +46 -28
- package/src/createConfigFileInHomedir.js +4 -6
- package/src/editorVersions.js +4 -10
- package/src/enrichRequestObject.js +11 -7
- package/src/getParentDirectoryContainingFileSync.js +4 -6
- package/src/modules/connectors/index.js +13 -10
- package/src/modules/connectors/package.json +2 -1
- package/src/modules/connectors/src/command.build.controller.js +13 -15
- package/src/modules/connectors/src/command.build.js +11 -4
- package/src/modules/connectors/src/command.download-self-contained.controller.js +6 -8
- package/src/modules/connectors/src/command.download-self-contained.js +10 -3
- package/src/modules/connectors/src/command.init.controller.js +7 -9
- package/src/modules/connectors/src/command.init.js +10 -3
- package/src/modules/connectors/src/command.run.controller.js +14 -16
- package/src/modules/connectors/src/command.run.js +8 -4
- package/src/modules/connectors/src/command.upgrade.controller.js +7 -9
- package/src/modules/connectors/src/command.upgrade.js +10 -3
- package/src/modules/connectors/src/command.versions.controller.js +2 -4
- package/src/modules/connectors/src/command.versions.js +10 -3
- package/src/modules/connectors/src/utilities/FontoxmlConnectorsManifest.js +2 -6
- package/src/modules/connectors/src/utilities/cleanup.js +6 -8
- package/src/modules/connectors/src/utilities/constants.js +5 -3
- package/src/modules/connectors/src/utilities/copyWhitelistedFiles.js +4 -6
- package/src/modules/connectors/src/utilities/executeAndLog.js +4 -5
- package/src/modules/connectors/src/utilities/getVerbosityLevel.js +3 -5
- package/src/modules/connectors/src/utilities/getWhitelist.js +5 -7
- package/src/modules/connectors/src/utilities/setEntryVisibility.js +3 -14
- package/src/modules/connectors/src/utilities/validateInstance.js +5 -7
- package/src/modules/content-quality/index.js +14 -11
- package/src/modules/content-quality/package.json +2 -1
- package/src/modules/content-quality/src/command.build.controller.js +13 -15
- package/src/modules/content-quality/src/command.build.js +11 -4
- package/src/modules/content-quality/src/command.download-self-contained.controller.js +6 -8
- package/src/modules/content-quality/src/command.download-self-contained.js +11 -4
- package/src/modules/content-quality/src/command.init.controller.js +7 -9
- package/src/modules/content-quality/src/command.init.js +11 -4
- package/src/modules/content-quality/src/command.run.controller.js +13 -15
- package/src/modules/content-quality/src/command.run.js +8 -4
- package/src/modules/content-quality/src/command.upgrade.controller.js +7 -9
- package/src/modules/content-quality/src/command.upgrade.js +11 -4
- package/src/modules/content-quality/src/command.versions.controller.js +2 -4
- package/src/modules/content-quality/src/command.versions.js +10 -3
- package/src/modules/content-quality/src/utilities/FontoxmlFcqManifest.js +2 -6
- package/src/modules/content-quality/src/utilities/cleanup.js +6 -8
- package/src/modules/content-quality/src/utilities/constants.js +5 -3
- package/src/modules/content-quality/src/utilities/copyWhitelistedFiles.js +4 -6
- package/src/modules/content-quality/src/utilities/executeAndLog.js +4 -5
- package/src/modules/content-quality/src/utilities/getVerbosityLevel.js +3 -5
- package/src/modules/content-quality/src/utilities/getWhitelist.js +5 -7
- package/src/modules/content-quality/src/utilities/setEntryVisibility.js +3 -14
- package/src/modules/content-quality/src/utilities/validateInstance.js +5 -7
- package/src/modules/core/index.js +14 -18
- package/src/modules/core/package.json +2 -1
- package/src/modules/core/src/command.fdt.js +1 -3
- package/src/modules/core/src/command.license.validate.js +1 -3
- package/src/modules/core/src/command.module.js +6 -8
- package/src/modules/core/src/command.who.js +6 -4
- package/src/modules/core/src/precontroller.debug.js +2 -3
- package/src/modules/core/src/precontroller.help.js +7 -5
- package/src/modules/document-history/index.js +17 -8
- package/src/modules/document-history/instanceBuild/Dockerfile +4 -0
- package/src/modules/document-history/instanceDevBuild/.env +2 -0
- package/src/modules/document-history/instanceDevBuild/docker-compose.yml +9 -0
- package/src/modules/document-history/instanceTemplate/.env +7 -0
- package/src/modules/document-history/instanceTemplate/Configuration/sx.xml +4 -0
- package/src/modules/document-history/package.json +2 -1
- package/src/modules/document-history/src/command.build.controller.js +260 -0
- package/src/modules/document-history/src/command.build.js +56 -0
- package/src/modules/document-history/src/command.download-self-contained.controller.js +6 -8
- package/src/modules/document-history/src/command.download-self-contained.js +10 -3
- package/src/modules/document-history/src/command.init.controller.js +91 -0
- package/src/modules/document-history/src/command.init.js +44 -0
- package/src/modules/document-history/src/command.run.controller.js +444 -0
- package/src/modules/document-history/src/command.run.js +64 -0
- package/src/modules/document-history/src/command.upgrade.controller.js +52 -0
- package/src/modules/document-history/src/command.upgrade.js +44 -0
- package/src/modules/document-history/src/command.versions.controller.js +2 -4
- package/src/modules/document-history/src/command.versions.js +10 -3
- package/src/modules/document-history/src/utilities/FontoxmlFdhManifest.js +30 -0
- package/src/modules/document-history/src/utilities/cleanup.js +70 -0
- package/src/modules/document-history/src/utilities/constants.js +44 -0
- package/src/modules/document-history/src/utilities/copyWhitelistedFiles.js +22 -0
- package/src/modules/document-history/src/utilities/executeAndLog.js +63 -0
- package/src/modules/document-history/src/utilities/getVerbosityLevel.js +11 -0
- package/src/modules/document-history/src/utilities/getWhitelist.js +16 -0
- package/src/modules/document-history/src/utilities/setEntryVisibility.js +22 -0
- package/src/modules/document-history/src/utilities/validateInstance.js +29 -0
- package/src/modules/editor/dev-cms/configureFontoSessionMiddleware.js +1 -5
- package/src/modules/editor/dev-cms/configureScopeMiddleware.js +3 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureAssetGetRouteHandler.js +1 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureAssetPostRouteHandler.js +3 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureAssetPreviewGetRouteHandler.js +1 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureBodyParserMiddleware.js +3 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureBrowsePostRouteHandler.js +1 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardAssetRouter.js +5 -9
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardBrowseRouter.js +3 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardDocumentRouter.js +13 -15
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardHeartbeatRouter.js +3 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardProxyRouter.js +7 -10
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardReferenceRouter.js +5 -7
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardReviewRouter.js +10 -16
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureConnectorsCmsStandardRouter.js +3 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDebugRouteHandler.js +2 -4
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDevelopmentCmsMiddleware.js +3 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentCompareRouteHandler.js +2 -4
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentGetRouteHandler.js +1 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentHistoryGetRouteHandler.js +2 -4
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentLockPutRouteHandler.js +1 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentPostRouteHandler.js +4 -4
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentPresearchPostRouteHandler.js +3 -7
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentPreviewRouteHandler.js +2 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentPutRouteHandler.js +1 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentRevisionGetRouteHandler.js +2 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureDocumentStatePostRouteHandler.js +1 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureHeartbeatGetRouteHandler.js +1 -5
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReferenceCreatePostRouteHandler.js +2 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReferenceGetPostRouteHandler.js +2 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReferenceMetadataUpdatePatchRouteHandler.js +2 -4
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReviewAnnotationGetPostRouteHandler.js +4 -9
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReviewAnnotationPostRouteHandler.js +4 -8
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReviewAnnotationPutRouteHandler.js +7 -11
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReviewAnnotationReplyPostRouteHandler.js +3 -7
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReviewAnnotationReplyPutRouteHandler.js +5 -9
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureReviewStatePostRouteHandler.js +3 -8
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureSimulatedDelayMiddleware.js +1 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/configureUploadMiddleware.js +4 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/correlationIdRepository.js +2 -2
- package/src/modules/editor/dev-cms/connectors-cms-standard/createMiddleware.js +25 -18
- package/src/modules/editor/dev-cms/connectors-cms-standard/getFileHash.js +3 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/referenceRepository.js +10 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/review-annotations/AnnotationDatabase.js +24 -64
- package/src/modules/editor/dev-cms/connectors-cms-standard/review-annotations/DebuggingConfiguration.js +1 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/review-annotations/EarlyReturnSymbol.js +1 -1
- package/src/modules/editor/dev-cms/connectors-cms-standard/review-annotations/Result.js +6 -14
- package/src/modules/editor/dev-cms/connectors-cms-standard/review-annotations/httpStatusCodeHelpers.js +13 -7
- package/src/modules/editor/dev-cms/connectors-cms-standard/review-annotations/mapAnnotationResult.js +2 -4
- package/src/modules/editor/dev-cms/connectors-cms-standard/stores/DevelopmentCms.js +6 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/stores/FileSystemStore.js +6 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/stores/HistoryStore.js +7 -6
- package/src/modules/editor/dev-cms/connectors-cms-standard/stores/MemoryStore.js +3 -3
- package/src/modules/editor/dev-cms/connectors-cms-standard/stores/mergeItems.js +2 -2
- package/src/modules/editor/dev-cms/connectors-cms-standard/stores/unmergeableRevisionList.js +1 -1
- package/src/modules/editor/dev-cms/connectors-dist/configureAuthMiddleware.js +5 -7
- package/src/modules/editor/dev-cms/connectors-dist/createMiddleware.js +4 -8
- package/src/modules/editor/dev-cms/connectors-health/configureConnectorsHealthRouter.js +3 -7
- package/src/modules/editor/dev-cms/connectors-health/configureHealthGetRouteHandler.js +1 -5
- package/src/modules/editor/dev-cms/connectors-health/createMiddleware.js +2 -6
- package/src/modules/editor/dev-cms/setupDevCms.js +17 -18
- package/src/modules/editor/index.js +20 -24
- package/src/modules/editor/package.json +2 -1
- package/src/modules/editor/src/astHelpers/{addWarningsForRemovedComments.js → addWarningsForRemovedComments.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{getClosestNodeWithOffset.js → getClosestNodeWithOffset.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{getDescendantNodes.js → getDescendantNodes.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{hasMultipleReturnStatements.js → hasMultipleReturnStatements.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{isAmdDefineCallExpression.js → isAmdDefineCallExpression.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{isAmdFactoryReturnStatement.js → isAmdFactoryReturnStatement.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{isInteropDefaultExpressionStatement.js → isInteropDefaultExpressionStatement.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{isInvalidTextLoaderImportDeclaration.js → isInvalidTextLoaderImportDeclaration.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{isRequireToUrlCallExpression.js → isRequireToUrlCallExpression.cjs} +0 -0
- package/src/modules/editor/src/astHelpers/{moveComments.js → moveComments.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{cleanupRegisterXQueryModulePlugin.js → cleanupRegisterXQueryModulePlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{convertAmdToEsmPlugin.js → convertAmdToEsmPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{recastPlugin.js → recastPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{rewriteConfigImportsPlugin.js → rewriteConfigImportsPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{rewriteImportFileExtensionPlugin.js → rewriteImportFileExtensionPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{rewriteInteropDefaultPlugin.js → rewriteInteropDefaultPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{rewriteJsonLoaderPlugin.js → rewriteJsonLoaderPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{rewriteMainJsImportsPlugin.js → rewriteMainJsImportsPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{rewriteSrcPathPlugin.js → rewriteSrcPathPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{rewriteSvgLoaderPlugin.js → rewriteSvgLoaderPlugin.cjs} +0 -0
- package/src/modules/editor/src/babelPlugins/{validatePlugin.js → validatePlugin.cjs} +0 -0
- package/src/modules/editor/src/commands/api/convertEditorWithOutput.js +13 -14
- package/src/modules/editor/src/commands/command.build.controller.js +7 -10
- package/src/modules/editor/src/commands/command.build.js +10 -3
- package/src/modules/editor/src/commands/command.convert.editor.controller.js +7 -9
- package/src/modules/editor/src/commands/command.convert.editor.js +10 -3
- package/src/modules/editor/src/commands/command.convert.package.controller.js +17 -20
- package/src/modules/editor/src/commands/command.convert.package.js +10 -3
- package/src/modules/editor/src/commands/command.run.controller.js +44 -55
- package/src/modules/editor/src/commands/command.run.js +10 -3
- package/src/modules/editor/src/config.js +112 -112
- package/src/modules/editor/src/convert.js +3 -9
- package/src/modules/editor/src/getAppConfig.js +27 -8
- package/src/modules/editor/src/getAppManifest.js +8 -8
- package/src/modules/editor/src/getDependenciesInLoadOrder.js +6 -14
- package/src/modules/editor/src/getImportsForPackages.js +5 -5
- package/src/modules/editor/src/getPatternsForSpecialFileType.js +2 -2
- package/src/modules/editor/src/getWebpackConfig.js +25 -23
- package/src/modules/editor/src/getWebpackDevMiddlewareConfig.js +2 -2
- package/src/modules/editor/src/helpers/WarningsByFilename.js +1 -1
- package/src/modules/editor/src/helpers/mergeIndexPageAndManifest.js +4 -4
- package/src/modules/editor/src/helpers/normalisePath.js +3 -3
- package/src/modules/editor/src/helpers/outputWarningsByFilename.js +4 -4
- package/src/modules/editor/src/helpers/prettifyJsFile.js +3 -6
- package/src/modules/editor/src/helpers/renameJsxFile.js +4 -4
- package/src/modules/editor/src/helpers/transformJsFile.js +24 -10
- package/src/modules/editor/src/helpers/updateEditorPackageJson.js +4 -4
- package/src/modules/editor/src/helpers/validateJsFile.js +11 -7
- package/src/modules/editor/src/helpers/writeJsFileToDisk.js +3 -3
- package/src/modules/editor/src/templates/{app-entry.js → app-entry.cjs} +0 -0
- package/src/modules/editor/src/webpackLoaders/{generatedLoader.js → generatedLoader.cjs} +12 -3
- package/src/modules/editor/src/webpackLoaders/{platformSourceMapLoader.js → platformSourceMapLoader.cjs} +2 -2
- package/src/modules/editor/src/webpackLoaders/{symbolLoader.js → symbolLoader.cjs} +0 -0
- package/src/modules/editor/src/webpackLoaders/{vendorsSourceMapLoader.js → vendorsSourceMapLoader.cjs} +0 -0
- package/src/modules/editor/src/webpackPlugins/CopyPlugin.js +177 -162
- package/src/modules/editor/src/webpackPlugins/DependenciesInLoadOrderPlugin.js +2 -6
- package/src/modules/editor/src/webpackPlugins/FdtOutputPlugin.js +4 -6
- package/src/modules/editor/src/webpackPlugins/RemoveExplicitExtensionResolvePlugin.js +3 -6
- package/src/modules/editor/src/webpackPlugins/ResolveImportAliasPlugin.js +2 -4
- package/src/modules/editor/src/webpackPlugins/UnitTestPlugin.js +5 -7
- package/src/modules/editor/test/dependecyWatching.test.js +11 -12
- package/src/modules/editor/test/fixtures.test.js +21 -16
- package/src/modules/editor/test/helpers/appMutations/addFilesToPackage.js +4 -4
- package/src/modules/editor/test/helpers/appMutations/addFontoManifestToPackage.js +4 -4
- package/src/modules/editor/test/helpers/appMutations/addPackage.js +7 -11
- package/src/modules/editor/test/helpers/appMutations/generateSpecialFiles.js +2 -2
- package/src/modules/editor/test/helpers/appMutations/mutateConfigFontoManifest.js +4 -4
- package/src/modules/editor/test/helpers/appMutations/mutatePackageFontoManifest.js +4 -4
- package/src/modules/editor/test/helpers/appMutations/removeFilesFromPackage.js +4 -4
- package/src/modules/editor/test/helpers/appMutations/removePackage.js +5 -5
- package/src/modules/editor/test/helpers/assertFixtureSnapshot.js +8 -6
- package/src/modules/editor/test/helpers/createAppStructure.js +8 -4
- package/src/modules/editor/test/helpers/createTempDirectory.js +3 -3
- package/src/modules/editor/test/helpers/createWebpackWatch.js +21 -22
- package/src/modules/editor/test/helpers/normaliseLineEndings.js +2 -2
- package/src/modules/editor-pre-7-7-0/index.js +19 -23
- package/src/modules/editor-pre-7-7-0/package.json +2 -1
- package/src/modules/editor-pre-7-7-0/src/api/addCommentToAstNode.js +6 -9
- package/src/modules/editor-pre-7-7-0/src/api/addonsAddDependencies.js +1 -3
- package/src/modules/editor-pre-7-7-0/src/api/createMessageTemplate.js +4 -6
- package/src/modules/editor-pre-7-7-0/src/api/createPackageDirectoryPath.js +4 -6
- package/src/modules/editor-pre-7-7-0/src/api/createPrettifiedCode.js +12 -8
- package/src/modules/editor-pre-7-7-0/src/api/downloadEditorSDK.js +3 -5
- package/src/modules/editor-pre-7-7-0/src/api/executeAndLog.js +4 -6
- package/src/modules/editor-pre-7-7-0/src/api/extractZip.js +4 -6
- package/src/modules/editor-pre-7-7-0/src/api/getAddonLabel.js +2 -4
- package/src/modules/editor-pre-7-7-0/src/api/getAddonLabels.js +3 -5
- package/src/modules/editor-pre-7-7-0/src/api/getAddonLabelsForChanges.js +4 -6
- package/src/modules/editor-pre-7-7-0/src/api/getAddonsFromEditorSDK.js +2 -4
- package/src/modules/editor-pre-7-7-0/src/api/init/checkEditorDestination.js +2 -4
- package/src/modules/editor-pre-7-7-0/src/api/init/createConfigConfiguration.js +13 -11
- package/src/modules/editor-pre-7-7-0/src/api/init/createConfigFontoManifest.js +3 -5
- package/src/modules/editor-pre-7-7-0/src/api/init/createSchemaExperienceResolver.js +11 -8
- package/src/modules/editor-pre-7-7-0/src/api/inquirerPrompts.js +20 -30
- package/src/modules/editor-pre-7-7-0/src/api/npmInstall.js +5 -7
- package/src/modules/editor-pre-7-7-0/src/api/promptForVersionAndDownloadEditorSDK.js +8 -11
- package/src/modules/editor-pre-7-7-0/src/api/schema/buildSchemaExperienceConfigurationModel.js +2 -6
- package/src/modules/editor-pre-7-7-0/src/api/schema/checkIfCompiledSchemaOverwritesFiles.js +3 -5
- package/src/modules/editor-pre-7-7-0/src/api/schema/compile.js +3 -5
- package/src/modules/editor-pre-7-7-0/src/api/schema/createCommentsForElement.js +6 -10
- package/src/modules/editor-pre-7-7-0/src/api/schema/createSchemaExperiencePackages.js +13 -15
- package/src/modules/editor-pre-7-7-0/src/api/schema/createSchemaPackages.js +7 -11
- package/src/modules/editor-pre-7-7-0/src/api/schema/getPrefixByNamespaceUri.js +4 -6
- package/src/modules/editor-pre-7-7-0/src/api/schema/getSchemaFontoJson.js +5 -7
- package/src/modules/editor-pre-7-7-0/src/api/schema/getVersionedSchemaCompilerBaseUrl.js +4 -5
- package/src/modules/editor-pre-7-7-0/src/api/schema/zipHelpers.js +6 -8
- package/src/modules/editor-pre-7-7-0/src/api/updateManifest.js +2 -4
- package/src/modules/editor-pre-7-7-0/src/api/upgrade/getMajorVersion.js +1 -5
- package/src/modules/editor-pre-7-7-0/src/api/upgrade/preprocessData.js +3 -5
- package/src/modules/editor-pre-7-7-0/src/api/upgrade/updateConfigFontoManifest.js +2 -4
- package/src/modules/editor-pre-7-7-0/src/api/validateAddons.js +1 -3
- package/src/modules/editor-pre-7-7-0/src/api/validateManifest.js +1 -3
- package/src/modules/editor-pre-7-7-0/src/api/writeAstProgramToFile.js +7 -6
- package/src/modules/editor-pre-7-7-0/src/command.addons.controller.js +18 -25
- package/src/modules/editor-pre-7-7-0/src/command.addons.js +10 -3
- package/src/modules/editor-pre-7-7-0/src/command.build.controller.js +6 -8
- package/src/modules/editor-pre-7-7-0/src/command.build.js +10 -3
- package/src/modules/editor-pre-7-7-0/src/command.init.controller.js +33 -36
- package/src/modules/editor-pre-7-7-0/src/command.init.js +10 -3
- package/src/modules/editor-pre-7-7-0/src/command.run.controller.js +6 -8
- package/src/modules/editor-pre-7-7-0/src/command.run.js +10 -3
- package/src/modules/editor-pre-7-7-0/src/command.schema.compile.controller.js +10 -12
- package/src/modules/editor-pre-7-7-0/src/command.schema.compile.js +10 -3
- package/src/modules/editor-pre-7-7-0/src/command.upgrade.controller.js +24 -31
- package/src/modules/editor-pre-7-7-0/src/command.upgrade.js +10 -3
- package/src/modules/editor-pre-7-7-0/src/command.versions.controller.js +2 -4
- package/src/modules/editor-pre-7-7-0/src/command.versions.js +10 -3
- package/src/modules/editor-pre-7-7-0/test/api/schema/buildSchemaExperienceConfigurationModel.test.js +19 -18
- package/src/modules/editor-pre-7-7-0/test/api/schema/createCommentsForElement.test.js +7 -10
- package/src/modules/editor-pre-7-7-0/test/api/schema/getPrefixByNamespaceUri.test.js +3 -6
- package/src/modules/editor-pre-7-7-0/test/api/schema/testHelpers.js +5 -14
- package/src/modules/editor-pre-7-7-0/test/api/schema/zipSchemaSource.test.js +9 -7
- package/src/modules/localization/index.js +13 -13
- package/src/modules/localization/package.json +2 -1
- package/src/modules/localization/src/api/Message.js +3 -3
- package/src/modules/localization/src/api/createMessagesTable.js +3 -5
- package/src/modules/localization/src/api/deduplicateMessages.js +2 -2
- package/src/modules/localization/src/api/extractMessages.js +5 -5
- package/src/modules/localization/src/api/getMessagesFromOperation.js +3 -3
- package/src/modules/localization/src/api/getMessagesFromSource.js +9 -4
- package/src/modules/localization/src/api/getOperationMessages.js +9 -9
- package/src/modules/localization/src/api/getSourceMessages.js +9 -8
- package/src/modules/localization/src/api/index.js +10 -5
- package/src/modules/localization/src/api/loadMessageBundle.js +6 -5
- package/src/modules/localization/src/api/{parser.js → parser.cjs} +0 -0
- package/src/modules/localization/src/api/promiseUtils.js +1 -1
- package/src/modules/localization/src/api/updateMessagesWithTemplate.js +2 -2
- package/src/modules/localization/src/command.extract.controller.js +7 -9
- package/src/modules/localization/src/command.extract.js +10 -3
- package/src/modules/localization/src/command.merge.controller.js +7 -9
- package/src/modules/localization/src/command.merge.js +10 -3
- package/src/modules/localization/src/command.messages.controller.js +5 -7
- package/src/modules/localization/src/command.messages.js +11 -4
- package/src/modules/localization/src/command.update.controller.js +8 -10
- package/src/modules/localization/src/command.update.js +10 -3
- package/src/modules/localization/test/api/Message.test.js +3 -3
- package/src/modules/localization/test/api/deduplicateMessages.test.js +4 -5
- package/src/modules/localization/test/api/getMessagesFromOperation.test.js +3 -4
- package/src/modules/localization/test/api/getMessagesFromSource.test.js +3 -4
- package/src/modules/localization/test/api/parser.test.js +3 -2
- package/src/modules/localization/test/api/promiseUtils.test.js +2 -2
- package/src/modules/localization/test/api/roundtripThroughJson.js +2 -2
- package/src/modules/localization/test/api/updateMessagesWithTemplate.test.js +4 -5
- package/src/modules/localization/test/command.extract.test.js +11 -10
- package/src/modules/localization/test/command.merge.test.js +11 -10
- package/src/modules/localization/test/command.messages.test.js +10 -9
- package/src/modules/localization/test/command.update.test.js +11 -10
- package/src/modules/localization/test/index.test.js +15 -14
- package/src/modules/localization/test/promiseUtils.test.js +2 -4
- package/src/modules/operations/index.js +5 -6
- package/src/modules/operations/package.json +2 -1
- package/src/modules/operations/src/api/createOperationsTable.js +3 -5
- package/src/modules/operations/src/api/getOperation.js +3 -5
- package/src/modules/operations/src/api/getOperations.js +12 -14
- package/src/modules/operations/src/command.operation.controller.js +3 -5
- package/src/modules/operations/src/command.operation.js +10 -3
- package/src/modules/operations/src/command.operations.controller.js +4 -6
- package/src/modules/operations/src/command.operations.js +11 -4
- package/src/modules/operations/test/command.operation.test.js +10 -9
- package/src/modules/operations/test/command.operations.test.js +11 -9
- package/src/modules/operations/test/getOperation.test.js +6 -4
- package/src/modules/operations/test/getOperations.test.js +6 -4
- package/src/modules/operations/test/index.test.js +11 -11
- package/src/modules/review/index.js +13 -10
- package/src/modules/review/package.json +2 -1
- package/src/modules/review/src/command.build.controller.js +13 -15
- package/src/modules/review/src/command.build.js +11 -4
- package/src/modules/review/src/command.download-self-contained.controller.js +6 -8
- package/src/modules/review/src/command.download-self-contained.js +10 -3
- package/src/modules/review/src/command.init.controller.js +7 -9
- package/src/modules/review/src/command.init.js +10 -3
- package/src/modules/review/src/command.run.controller.js +14 -16
- package/src/modules/review/src/command.run.js +8 -4
- package/src/modules/review/src/command.upgrade.controller.js +8 -10
- package/src/modules/review/src/command.upgrade.js +10 -3
- package/src/modules/review/src/command.versions.controller.js +2 -4
- package/src/modules/review/src/command.versions.js +10 -3
- package/src/modules/review/src/utilities/FontoxmlReviewManifest.js +2 -6
- package/src/modules/review/src/utilities/cleanup.js +6 -8
- package/src/modules/review/src/utilities/constants.js +5 -3
- package/src/modules/review/src/utilities/copyWhitelistedFiles.js +4 -6
- package/src/modules/review/src/utilities/executeAndLog.js +4 -5
- package/src/modules/review/src/utilities/getVerbosityLevel.js +3 -5
- package/src/modules/review/src/utilities/getWhitelist.js +5 -7
- package/src/modules/review/src/utilities/setEntryVisibility.js +3 -14
- package/src/modules/review/src/utilities/validateInstance.js +6 -8
- package/src/modules/schema/index.js +16 -24
- package/src/modules/schema/package.json +2 -1
- package/src/modules/schema/src/api/AttributeSummary.js +2 -4
- package/src/modules/schema/src/api/ElementSummary.js +2 -4
- package/src/modules/schema/src/api/SchemaSummary.js +11 -10
- package/src/modules/schema/src/api/SimpleTypeSummary.js +3 -5
- package/src/modules/schema/src/api/createAttributesTable.js +3 -5
- package/src/modules/schema/src/api/createElementsTable.js +3 -5
- package/src/modules/schema/src/api/createSchemasTable.js +4 -6
- package/src/modules/schema/src/api/createSimpleTypesTable.js +3 -5
- package/src/modules/schema/src/api/getClosestMatchingSchemaSummary.js +7 -9
- package/src/modules/schema/src/api/getSchemaSummaries.js +5 -7
- package/src/modules/schema/src/command.attribute.controller.js +3 -5
- package/src/modules/schema/src/command.attribute.js +10 -3
- package/src/modules/schema/src/command.attributes.controller.js +4 -6
- package/src/modules/schema/src/command.attributes.js +11 -4
- package/src/modules/schema/src/command.element.controller.js +4 -6
- package/src/modules/schema/src/command.element.js +10 -3
- package/src/modules/schema/src/command.elements.controller.js +4 -6
- package/src/modules/schema/src/command.elements.js +11 -4
- package/src/modules/schema/src/command.schemas.controller.js +4 -6
- package/src/modules/schema/src/command.schemas.js +11 -4
- package/src/modules/schema/src/command.simpletypes.controller.js +4 -6
- package/src/modules/schema/src/command.simpletypes.js +11 -4
- package/src/modules/schema/src/helpers/renderSimpleType.js +3 -5
- package/src/modules/schema/src/helpers/restrictionFormatter.js +2 -4
- package/src/modules/schema/test/AttributeSummary.test.js +3 -5
- package/src/modules/schema/test/ElementSummary.test.js +3 -5
- package/src/modules/schema/test/SchemaSummary.test.js +9 -7
- package/src/modules/schema/test/SimpleTypeSummary.test.js +3 -5
- package/src/modules/schema/test/command.attribute.test.js +14 -12
- package/src/modules/schema/test/command.attributes.test.js +14 -12
- package/src/modules/schema/test/command.element.test.js +14 -12
- package/src/modules/schema/test/command.elements.test.js +14 -12
- package/src/modules/schema/test/command.schemas.test.js +10 -9
- package/src/modules/schema/test/command.simpletypes.test.js +10 -9
- package/src/modules/schema/test/getClosestMatchingSchemaSummary.test.js +6 -4
- package/src/modules/schema/test/getSchemaSummaries.test.js +6 -4
- package/src/modules/schema/test/index.test.js +37 -37
- package/src/modules/schema/test/renderSimpleType.test.js +12 -13
- package/src/modules/schema/test/restrictionFormatter.test.js +3 -5
- package/src/modules/schema-compiler/index.js +13 -10
- package/src/modules/schema-compiler/package.json +2 -1
- package/src/modules/schema-compiler/src/command.build.controller.js +12 -15
- package/src/modules/schema-compiler/src/command.build.js +11 -4
- package/src/modules/schema-compiler/src/command.download-self-contained.controller.js +6 -8
- package/src/modules/schema-compiler/src/command.download-self-contained.js +10 -3
- package/src/modules/schema-compiler/src/command.init.controller.js +7 -9
- package/src/modules/schema-compiler/src/command.init.js +10 -3
- package/src/modules/schema-compiler/src/command.run.controller.js +14 -16
- package/src/modules/schema-compiler/src/command.run.js +6 -4
- package/src/modules/schema-compiler/src/command.upgrade.controller.js +8 -10
- package/src/modules/schema-compiler/src/command.upgrade.js +10 -3
- package/src/modules/schema-compiler/src/command.versions.controller.js +2 -4
- package/src/modules/schema-compiler/src/command.versions.js +10 -3
- package/src/modules/schema-compiler/src/utilities/FontoxmlSchemaCompilerManifest.js +2 -6
- package/src/modules/schema-compiler/src/utilities/cleanup.js +6 -8
- package/src/modules/schema-compiler/src/utilities/constants.js +5 -3
- package/src/modules/schema-compiler/src/utilities/copyWhitelistedFiles.js +4 -6
- package/src/modules/schema-compiler/src/utilities/executeAndLog.js +4 -5
- package/src/modules/schema-compiler/src/utilities/getVerbosityLevel.js +3 -5
- package/src/modules/schema-compiler/src/utilities/getWhitelist.js +5 -7
- package/src/modules/schema-compiler/src/utilities/setEntryVisibility.js +3 -14
- package/src/modules/schema-compiler/src/utilities/validateInstance.js +6 -8
- package/src/modules/spell-checker/index.js +13 -10
- package/src/modules/spell-checker/package.json +2 -1
- package/src/modules/spell-checker/src/command.build.controller.js +13 -15
- package/src/modules/spell-checker/src/command.build.js +11 -4
- package/src/modules/spell-checker/src/command.download-self-contained.controller.js +6 -8
- package/src/modules/spell-checker/src/command.download-self-contained.js +10 -3
- package/src/modules/spell-checker/src/command.init.controller.js +7 -9
- package/src/modules/spell-checker/src/command.init.js +10 -3
- package/src/modules/spell-checker/src/command.run.controller.js +13 -15
- package/src/modules/spell-checker/src/command.run.js +8 -4
- package/src/modules/spell-checker/src/command.upgrade.controller.js +8 -10
- package/src/modules/spell-checker/src/command.upgrade.js +10 -3
- package/src/modules/spell-checker/src/command.versions.controller.js +2 -4
- package/src/modules/spell-checker/src/command.versions.js +10 -3
- package/src/modules/spell-checker/src/utilities/FontoxmlSpellCheckerManifest.js +2 -6
- package/src/modules/spell-checker/src/utilities/cleanup.js +6 -8
- package/src/modules/spell-checker/src/utilities/constants.js +5 -3
- package/src/modules/spell-checker/src/utilities/copyWhitelistedFiles.js +4 -6
- package/src/modules/spell-checker/src/utilities/executeAndLog.js +4 -5
- package/src/modules/spell-checker/src/utilities/getVerbosityLevel.js +3 -5
- package/src/modules/spell-checker/src/utilities/getWhitelist.js +5 -7
- package/src/modules/spell-checker/src/utilities/setEntryVisibility.js +3 -14
- package/src/modules/spell-checker/src/utilities/validateInstance.js +6 -8
- package/src/response/FdtResponse.js +8 -13
- package/src/response/extras.js +3 -5
- package/src/response/primitives.js +4 -4
- package/test/App.test.js +113 -93
- package/test/AssertableWritableStream.test.js +3 -8
- package/test/FdtCommand.test.js +9 -7
- package/test/FdtTable.test.js +12 -11
- package/test/app/invalid-module-1/index.js +1 -1
- package/test/app/invalid-module-1/package.json +1 -0
- package/test/app/test-module-1/index.js +1 -1
- package/test/app/test-module-1/package.json +1 -0
- package/test/app/test-module-2/index.js +12 -7
- package/test/app/test-module-2/package.json +1 -0
- package/test/app/test-module-2/src/testLazyLoadCommand.js +2 -4
- package/test/app/test-module-2-duplicate/index.js +1 -3
- package/test/app/test-module-2-duplicate/package.json +1 -0
- package/test/app-pre-7-7-0/config.js +1 -1
- package/test/app-with-configjs/config.js +1 -1
- package/test/module.core.test.js +39 -29
|
@@ -0,0 +1,444 @@
|
|
|
1
|
+
import fs from 'fs-extra';
|
|
2
|
+
import os from 'os';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
|
|
5
|
+
import cleanup from './utilities/cleanup.js';
|
|
6
|
+
import constants from './utilities/constants.js';
|
|
7
|
+
import copyWhitelistedFiles from './utilities/copyWhitelistedFiles.js';
|
|
8
|
+
import executeAndLog from './utilities/executeAndLog.js';
|
|
9
|
+
import FontoxmlFdhManifest from './utilities/FontoxmlFdhManifest.js';
|
|
10
|
+
import getVerbosityLevel from './utilities/getVerbosityLevel.js';
|
|
11
|
+
import getWhitelist from './utilities/getWhitelist.js';
|
|
12
|
+
import setEntryVisibility from './utilities/setEntryVisibility.js';
|
|
13
|
+
import validateInstance from './utilities/validateInstance.js';
|
|
14
|
+
|
|
15
|
+
const verboseFdhConfigurationEntries = {
|
|
16
|
+
Logging__LogLevel__Default: 'Trace',
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
const DEFAULT_PORT = 6030;
|
|
20
|
+
|
|
21
|
+
function copyFdhConfiguration(fdhConfiguration, tempDir, verbosityLevel, res) {
|
|
22
|
+
const targetFdhConfiguration = path.join(tempDir, '.env');
|
|
23
|
+
|
|
24
|
+
return fs.exists(fdhConfiguration).then((exists) => {
|
|
25
|
+
// Read the configuration entries from the .env file or initialize an empty array.
|
|
26
|
+
let deferred = exists
|
|
27
|
+
? fs.readFile(fdhConfiguration, 'utf8').then((data) => {
|
|
28
|
+
return data.split(/\r?\n/g);
|
|
29
|
+
})
|
|
30
|
+
: new Promise((resolve, _reject) => {
|
|
31
|
+
resolve(new Array(0));
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
// Replace or set the defaults for verbosity.
|
|
35
|
+
if (verbosityLevel === constants.VERBOSITY_LEVEL_DEBUG) {
|
|
36
|
+
deferred = deferred.then((configurationEntries) => {
|
|
37
|
+
Object.keys(verboseFdhConfigurationEntries).forEach((key) => {
|
|
38
|
+
const configurationEntryIndex =
|
|
39
|
+
configurationEntries.findIndex((entry) =>
|
|
40
|
+
entry.startsWith(`${key}=`)
|
|
41
|
+
);
|
|
42
|
+
const value = verboseFdhConfigurationEntries[key];
|
|
43
|
+
if (configurationEntryIndex === -1) {
|
|
44
|
+
configurationEntries.push(`${key}=${value}`);
|
|
45
|
+
} else {
|
|
46
|
+
configurationEntries[
|
|
47
|
+
configurationEntryIndex
|
|
48
|
+
] = `${key}=${value}`;
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
return configurationEntries;
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
// Ignore options that shouldn't be applied when running through FDT.
|
|
56
|
+
deferred = deferred.then((configurationEntries) => {
|
|
57
|
+
let i = configurationEntries.length;
|
|
58
|
+
while (i--) {
|
|
59
|
+
const configurationLine = configurationEntries[i];
|
|
60
|
+
if (
|
|
61
|
+
!configurationLine.startsWith('#') &&
|
|
62
|
+
configurationLine.indexOf('=') !== -1
|
|
63
|
+
) {
|
|
64
|
+
const [key, _value] = configurationLine.split('=', 2);
|
|
65
|
+
|
|
66
|
+
if (key === 'ASPNETCORE_URLS') {
|
|
67
|
+
configurationEntries.splice(i, 1);
|
|
68
|
+
res.notice(
|
|
69
|
+
`Notice: The '${key}' configuration option in the '.env' file will be ignored when ` +
|
|
70
|
+
"running the application using FDT. The FDT '--port' option can be used to run the application " +
|
|
71
|
+
'under a different port.'
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return configurationEntries;
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
// Write the configuration to the .env file.
|
|
80
|
+
return deferred.then((configurationEntries) => {
|
|
81
|
+
const configurationData = configurationEntries.join(os.EOL);
|
|
82
|
+
return fs.writeFile(targetFdhConfiguration, configurationData);
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export default function runCommand(req, res) {
|
|
88
|
+
res.caption(req.command.getLongName());
|
|
89
|
+
|
|
90
|
+
const directoryPath = path.resolve(
|
|
91
|
+
req.options.location ? req.options.location : process.cwd()
|
|
92
|
+
);
|
|
93
|
+
const temporaryDirectoryPath = path.join(
|
|
94
|
+
directoryPath,
|
|
95
|
+
constants.TEMPORARY_DIRECTORY_NAME
|
|
96
|
+
);
|
|
97
|
+
const fdhConfigurationFilePath = req.options['config-location']
|
|
98
|
+
? path.resolve(req.options['config-location'])
|
|
99
|
+
: path.join(directoryPath, '.env');
|
|
100
|
+
const manifestFilePath = path.join(
|
|
101
|
+
directoryPath,
|
|
102
|
+
constants.MANIFEST_FILENAME
|
|
103
|
+
);
|
|
104
|
+
const verbosityLevel = getVerbosityLevel(
|
|
105
|
+
req.options.verbose,
|
|
106
|
+
req.options.debug
|
|
107
|
+
);
|
|
108
|
+
const port = req.options.port || DEFAULT_PORT;
|
|
109
|
+
const projectName = `${constants.DEFAULT_IMAGE_NAME}_${port}`;
|
|
110
|
+
|
|
111
|
+
let pidToKillOnForceExit = null;
|
|
112
|
+
const setPidToKillOnForceExit = (processToKill) => {
|
|
113
|
+
pidToKillOnForceExit = processToKill && processToKill.pid;
|
|
114
|
+
};
|
|
115
|
+
|
|
116
|
+
// Ensure we cleanup before exiting.
|
|
117
|
+
let stopping = false;
|
|
118
|
+
process.on('SIGINT', (_code) => {
|
|
119
|
+
if (stopping) {
|
|
120
|
+
if (pidToKillOnForceExit) {
|
|
121
|
+
process.kill(pidToKillOnForceExit);
|
|
122
|
+
}
|
|
123
|
+
process.exit();
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
stopping = true;
|
|
128
|
+
res.log('Gracefully stopping... (press Ctrl+C again to force)');
|
|
129
|
+
return cleanup(
|
|
130
|
+
temporaryDirectoryPath,
|
|
131
|
+
projectName,
|
|
132
|
+
res,
|
|
133
|
+
verbosityLevel
|
|
134
|
+
).then(process.exit);
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
return (
|
|
138
|
+
validateInstance(directoryPath)
|
|
139
|
+
.then(() => fs.exists(fdhConfigurationFilePath))
|
|
140
|
+
.then((exists) => {
|
|
141
|
+
if (!exists) {
|
|
142
|
+
if (req.options['config-location']) {
|
|
143
|
+
throw new Error(
|
|
144
|
+
`Fonto Document History config "${fdhConfigurationFilePath}" does not exist.`
|
|
145
|
+
);
|
|
146
|
+
}
|
|
147
|
+
res.notice(
|
|
148
|
+
`No .env file exists in the directory "${directoryPath}". See ${constants.DOCUMENTATION_CONFIGURATION_GUIDE} to configure the .env file.`
|
|
149
|
+
);
|
|
150
|
+
}
|
|
151
|
+
})
|
|
152
|
+
.then(() => fs.exists(manifestFilePath))
|
|
153
|
+
.then((exists) => {
|
|
154
|
+
// Verify fontoxmlFdhManifest file is present and valid.
|
|
155
|
+
if (!exists) {
|
|
156
|
+
throw new Error(
|
|
157
|
+
'The Fonto Document History manifest file does not exist.'
|
|
158
|
+
);
|
|
159
|
+
} else {
|
|
160
|
+
return FontoxmlFdhManifest.fromJsonFile(manifestFilePath);
|
|
161
|
+
}
|
|
162
|
+
})
|
|
163
|
+
// Cleanup possible remaining resources from a previous build or run.
|
|
164
|
+
.then(() =>
|
|
165
|
+
cleanup(
|
|
166
|
+
temporaryDirectoryPath,
|
|
167
|
+
projectName,
|
|
168
|
+
res,
|
|
169
|
+
verbosityLevel
|
|
170
|
+
)
|
|
171
|
+
)
|
|
172
|
+
.then(() => {
|
|
173
|
+
const destroySpinner = res.spinner(
|
|
174
|
+
`Building development image at "${directoryPath}"...`
|
|
175
|
+
);
|
|
176
|
+
|
|
177
|
+
// Retrieve data for the docker image
|
|
178
|
+
return FontoxmlFdhManifest.fromJsonFile(manifestFilePath).then(
|
|
179
|
+
(manifestObj) => {
|
|
180
|
+
const requestObj = {
|
|
181
|
+
'document-history': {
|
|
182
|
+
docker: {
|
|
183
|
+
version: manifestObj.fdhVersion,
|
|
184
|
+
},
|
|
185
|
+
},
|
|
186
|
+
};
|
|
187
|
+
|
|
188
|
+
return req.fdt.license
|
|
189
|
+
.getDataForProducts(requestObj)
|
|
190
|
+
.catch((error) => {
|
|
191
|
+
if (error.statusCode === 404) {
|
|
192
|
+
error.solution =
|
|
193
|
+
'This error might be caused by requesting a nonexisting Fonto Document History version, please check your version.';
|
|
194
|
+
}
|
|
195
|
+
throw error;
|
|
196
|
+
})
|
|
197
|
+
.then((productData) => {
|
|
198
|
+
const dockerData =
|
|
199
|
+
productData.products['document-history']
|
|
200
|
+
.docker;
|
|
201
|
+
|
|
202
|
+
// Create a hidden temporary directory.
|
|
203
|
+
return (
|
|
204
|
+
fs
|
|
205
|
+
.mkdir(temporaryDirectoryPath)
|
|
206
|
+
.then(() =>
|
|
207
|
+
setEntryVisibility(
|
|
208
|
+
temporaryDirectoryPath,
|
|
209
|
+
false
|
|
210
|
+
)
|
|
211
|
+
)
|
|
212
|
+
// Copy the instance files into the temporary directory.
|
|
213
|
+
.then(() => {
|
|
214
|
+
// Rewrite the version in the Dockerfile.
|
|
215
|
+
return fs
|
|
216
|
+
.readFile(
|
|
217
|
+
path.join(
|
|
218
|
+
constants.INSTANCE_BUILD_DIRECTORY_PATH,
|
|
219
|
+
'Dockerfile'
|
|
220
|
+
),
|
|
221
|
+
'utf8'
|
|
222
|
+
)
|
|
223
|
+
.then((dockerContent) =>
|
|
224
|
+
dockerContent.replace(
|
|
225
|
+
'${fdhImage}',
|
|
226
|
+
dockerData.image
|
|
227
|
+
)
|
|
228
|
+
)
|
|
229
|
+
.then((fixedDockerContent) =>
|
|
230
|
+
fs.writeFile(
|
|
231
|
+
path.join(
|
|
232
|
+
temporaryDirectoryPath,
|
|
233
|
+
'Dockerfile'
|
|
234
|
+
),
|
|
235
|
+
fixedDockerContent
|
|
236
|
+
)
|
|
237
|
+
);
|
|
238
|
+
})
|
|
239
|
+
.then(() =>
|
|
240
|
+
fs.copy(
|
|
241
|
+
constants.INSTANCE_DEV_BUILD_DIRECTORY_PATH,
|
|
242
|
+
temporaryDirectoryPath
|
|
243
|
+
)
|
|
244
|
+
)
|
|
245
|
+
.then(() => {
|
|
246
|
+
// Rewrite the port in the docker-compose file.
|
|
247
|
+
return fs
|
|
248
|
+
.readFile(
|
|
249
|
+
path.join(
|
|
250
|
+
temporaryDirectoryPath,
|
|
251
|
+
'docker-compose.yml'
|
|
252
|
+
),
|
|
253
|
+
'utf8'
|
|
254
|
+
)
|
|
255
|
+
.then((dockerComposeContent) =>
|
|
256
|
+
dockerComposeContent
|
|
257
|
+
.replace(
|
|
258
|
+
'${containerName}',
|
|
259
|
+
projectName
|
|
260
|
+
)
|
|
261
|
+
.replace(
|
|
262
|
+
'${fdhPort}',
|
|
263
|
+
port
|
|
264
|
+
)
|
|
265
|
+
)
|
|
266
|
+
.then(
|
|
267
|
+
(
|
|
268
|
+
fixedDockerComposeContent
|
|
269
|
+
) =>
|
|
270
|
+
fs.writeFile(
|
|
271
|
+
path.join(
|
|
272
|
+
temporaryDirectoryPath,
|
|
273
|
+
'docker-compose.yml'
|
|
274
|
+
),
|
|
275
|
+
fixedDockerComposeContent
|
|
276
|
+
)
|
|
277
|
+
);
|
|
278
|
+
})
|
|
279
|
+
.then(() => [
|
|
280
|
+
path.join(
|
|
281
|
+
directoryPath,
|
|
282
|
+
'Configuration'
|
|
283
|
+
),
|
|
284
|
+
])
|
|
285
|
+
.then(() => getWhitelist())
|
|
286
|
+
.then((whitelist) =>
|
|
287
|
+
copyWhitelistedFiles(
|
|
288
|
+
whitelist,
|
|
289
|
+
directoryPath,
|
|
290
|
+
path.join(
|
|
291
|
+
temporaryDirectoryPath,
|
|
292
|
+
'instance'
|
|
293
|
+
)
|
|
294
|
+
)
|
|
295
|
+
)
|
|
296
|
+
.then(() =>
|
|
297
|
+
copyFdhConfiguration(
|
|
298
|
+
fdhConfigurationFilePath,
|
|
299
|
+
temporaryDirectoryPath,
|
|
300
|
+
verbosityLevel,
|
|
301
|
+
res
|
|
302
|
+
)
|
|
303
|
+
)
|
|
304
|
+
|
|
305
|
+
// Pull the docker image
|
|
306
|
+
.then(() => {
|
|
307
|
+
return executeAndLog(
|
|
308
|
+
res,
|
|
309
|
+
'docker',
|
|
310
|
+
[
|
|
311
|
+
'login',
|
|
312
|
+
dockerData.registry,
|
|
313
|
+
'-u',
|
|
314
|
+
dockerData.login,
|
|
315
|
+
'-p',
|
|
316
|
+
dockerData.password,
|
|
317
|
+
],
|
|
318
|
+
null,
|
|
319
|
+
constants.VERBOSITY_LEVEL_NORMAL,
|
|
320
|
+
false,
|
|
321
|
+
setPidToKillOnForceExit
|
|
322
|
+
)
|
|
323
|
+
.then(() =>
|
|
324
|
+
executeAndLog(
|
|
325
|
+
res,
|
|
326
|
+
'docker',
|
|
327
|
+
[
|
|
328
|
+
'pull',
|
|
329
|
+
dockerData.image,
|
|
330
|
+
],
|
|
331
|
+
null,
|
|
332
|
+
verbosityLevel,
|
|
333
|
+
false,
|
|
334
|
+
setPidToKillOnForceExit
|
|
335
|
+
)
|
|
336
|
+
)
|
|
337
|
+
.then(() =>
|
|
338
|
+
executeAndLog(
|
|
339
|
+
res,
|
|
340
|
+
'docker',
|
|
341
|
+
[
|
|
342
|
+
'logout',
|
|
343
|
+
dockerData.registry,
|
|
344
|
+
],
|
|
345
|
+
null,
|
|
346
|
+
constants.VERBOSITY_LEVEL_NORMAL,
|
|
347
|
+
false,
|
|
348
|
+
setPidToKillOnForceExit
|
|
349
|
+
)
|
|
350
|
+
)
|
|
351
|
+
.catch(() => {
|
|
352
|
+
throw new Error(
|
|
353
|
+
'Failed to retrieve the image file.'
|
|
354
|
+
);
|
|
355
|
+
});
|
|
356
|
+
})
|
|
357
|
+
|
|
358
|
+
// Use docker-compose to build the development image.
|
|
359
|
+
.then(() =>
|
|
360
|
+
executeAndLog(
|
|
361
|
+
res,
|
|
362
|
+
'docker-compose',
|
|
363
|
+
verbosityLevel ===
|
|
364
|
+
constants.VERBOSITY_LEVEL_DEBUG
|
|
365
|
+
? [
|
|
366
|
+
'-p',
|
|
367
|
+
projectName,
|
|
368
|
+
'--verbose',
|
|
369
|
+
'build',
|
|
370
|
+
]
|
|
371
|
+
: [
|
|
372
|
+
'-p',
|
|
373
|
+
projectName,
|
|
374
|
+
'build',
|
|
375
|
+
],
|
|
376
|
+
temporaryDirectoryPath,
|
|
377
|
+
verbosityLevel,
|
|
378
|
+
false,
|
|
379
|
+
setPidToKillOnForceExit
|
|
380
|
+
)
|
|
381
|
+
)
|
|
382
|
+
.then(() =>
|
|
383
|
+
req.fdt.license.sendTelemetry({
|
|
384
|
+
product:
|
|
385
|
+
req.command.parent.name,
|
|
386
|
+
type: 'docker',
|
|
387
|
+
version: manifestObj.fdhVersion,
|
|
388
|
+
action: req.command.name,
|
|
389
|
+
})
|
|
390
|
+
)
|
|
391
|
+
.then(() => destroySpinner())
|
|
392
|
+
);
|
|
393
|
+
});
|
|
394
|
+
}
|
|
395
|
+
);
|
|
396
|
+
})
|
|
397
|
+
// Use docker-compose to run the development image. We hard-code verbose to true since docker does not yet support a --quiet or --silent flag. https://github.com/docker/compose/issues/3447
|
|
398
|
+
.then(() => {
|
|
399
|
+
res.notice(
|
|
400
|
+
`Starting Fonto Document History on "http://localhost:${port}"...`
|
|
401
|
+
);
|
|
402
|
+
return executeAndLog(
|
|
403
|
+
res,
|
|
404
|
+
'docker-compose',
|
|
405
|
+
verbosityLevel === constants.VERBOSITY_LEVEL_DEBUG
|
|
406
|
+
? ['-p', projectName, '--verbose', 'up']
|
|
407
|
+
: ['-p', projectName, 'up'],
|
|
408
|
+
temporaryDirectoryPath,
|
|
409
|
+
verbosityLevel,
|
|
410
|
+
true,
|
|
411
|
+
setPidToKillOnForceExit
|
|
412
|
+
);
|
|
413
|
+
})
|
|
414
|
+
// Cleanup temporary directory.
|
|
415
|
+
.then(() =>
|
|
416
|
+
cleanup(
|
|
417
|
+
temporaryDirectoryPath,
|
|
418
|
+
projectName,
|
|
419
|
+
res,
|
|
420
|
+
verbosityLevel
|
|
421
|
+
)
|
|
422
|
+
)
|
|
423
|
+
.catch((error) => {
|
|
424
|
+
if (!stopping) {
|
|
425
|
+
res.notice(
|
|
426
|
+
`See our documentation at ${constants.DOCUMENTATION_EXECUTE_ERROR} for help.`
|
|
427
|
+
);
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
return cleanup(
|
|
431
|
+
temporaryDirectoryPath,
|
|
432
|
+
projectName,
|
|
433
|
+
res,
|
|
434
|
+
verbosityLevel
|
|
435
|
+
)
|
|
436
|
+
.then(() => {
|
|
437
|
+
throw error;
|
|
438
|
+
})
|
|
439
|
+
.catch(() => {
|
|
440
|
+
throw error;
|
|
441
|
+
});
|
|
442
|
+
})
|
|
443
|
+
);
|
|
444
|
+
}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { fileURLToPath } from 'url';
|
|
3
|
+
|
|
4
|
+
import constants from './utilities/constants.js';
|
|
5
|
+
|
|
6
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
7
|
+
const __dirname = path.dirname(__filename);
|
|
8
|
+
|
|
9
|
+
export default (moduleRegistration, fdhCommand) => {
|
|
10
|
+
fdhCommand
|
|
11
|
+
.addCommand('run', path.resolve(__dirname, 'command.run.controller.js'))
|
|
12
|
+
.setDescription(
|
|
13
|
+
'Run a Fonto Document History instance for development purposes. Requires Docker to be installed.'
|
|
14
|
+
)
|
|
15
|
+
|
|
16
|
+
.addOption(
|
|
17
|
+
'port',
|
|
18
|
+
'p',
|
|
19
|
+
'Listen on the specified port instead of listening on the default port (default=6030).'
|
|
20
|
+
)
|
|
21
|
+
|
|
22
|
+
.addOption(
|
|
23
|
+
'location',
|
|
24
|
+
'l',
|
|
25
|
+
'The directory where the instance is located. Defaults to the current working directory.',
|
|
26
|
+
false
|
|
27
|
+
)
|
|
28
|
+
.addOption(
|
|
29
|
+
'config-location',
|
|
30
|
+
'c',
|
|
31
|
+
`The path where the configuration file (.env) is located. Information about the .env file can be found at ${constants.DOCUMENTATION_CONFIGURATION_GUIDE}.`,
|
|
32
|
+
false
|
|
33
|
+
)
|
|
34
|
+
|
|
35
|
+
.addOption(
|
|
36
|
+
'verbose',
|
|
37
|
+
null,
|
|
38
|
+
'Output default stdout and stderr information.'
|
|
39
|
+
)
|
|
40
|
+
.addOption(
|
|
41
|
+
'debug',
|
|
42
|
+
null,
|
|
43
|
+
'Output all debug information. This also overrides the Logging__LogLevel__Default if set.'
|
|
44
|
+
)
|
|
45
|
+
|
|
46
|
+
.addExample(
|
|
47
|
+
`${moduleRegistration.getAppInfo().name} ${
|
|
48
|
+
constants.COMMAND_PREFIX
|
|
49
|
+
} run`,
|
|
50
|
+
'Build and run a development image using the Fonto Document History instance and configuration located at the current working directory.'
|
|
51
|
+
)
|
|
52
|
+
.addExample(
|
|
53
|
+
`${moduleRegistration.getAppInfo().name} ${
|
|
54
|
+
constants.COMMAND_PREFIX
|
|
55
|
+
} run --port 7455`,
|
|
56
|
+
'Build and run a development image using the Fonto Document History instance and configuration located at the current working directory on the non-default port 7455. '
|
|
57
|
+
)
|
|
58
|
+
.addExample(
|
|
59
|
+
`${moduleRegistration.getAppInfo().name} ${
|
|
60
|
+
constants.COMMAND_PREFIX
|
|
61
|
+
} run --location /opt/my-instances/specific-instance/ --config-location /opt/my-instances/.env`,
|
|
62
|
+
'Build and run a development image using the Fonto Document History instance located at "/opt/my-instances/specific-instance/" using the configuration located at "/opt/my-instances/.env".'
|
|
63
|
+
);
|
|
64
|
+
};
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import fs from 'fs-extra';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
|
|
4
|
+
import constants from './utilities/constants.js';
|
|
5
|
+
import FontoxmlFdhManifest from './utilities/FontoxmlFdhManifest.js';
|
|
6
|
+
import setEntryVisibility from './utilities/setEntryVisibility.js';
|
|
7
|
+
|
|
8
|
+
export default async function upgradeCommand(req, res) {
|
|
9
|
+
res.caption(req.command.getLongName());
|
|
10
|
+
|
|
11
|
+
// Check if the given version exist.
|
|
12
|
+
const sdkVersions = await req.fdt.license.getVersionsForProduct(
|
|
13
|
+
'document-history'
|
|
14
|
+
);
|
|
15
|
+
const version = req.options.version;
|
|
16
|
+
if (!sdkVersions.includes(version)) {
|
|
17
|
+
throw new Error(
|
|
18
|
+
`Could not upgrade to version (${version}), please check if it is a valid version. The latest version is ${sdkVersions.getLatestStable()}, run \`fdt document-history versions\` to get a list of all available versions.`
|
|
19
|
+
);
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const destroySpinner = res.spinner(
|
|
23
|
+
`Upgrading your Fonto Document History instance to ${version}...`
|
|
24
|
+
);
|
|
25
|
+
|
|
26
|
+
const directoryPath = path.resolve(
|
|
27
|
+
req.options.location ? req.options.location : process.cwd()
|
|
28
|
+
);
|
|
29
|
+
const manifestFilePath = path.join(
|
|
30
|
+
directoryPath,
|
|
31
|
+
constants.MANIFEST_FILENAME
|
|
32
|
+
);
|
|
33
|
+
let currentVersion;
|
|
34
|
+
return setEntryVisibility(manifestFilePath, true)
|
|
35
|
+
.then(() => FontoxmlFdhManifest.fromJsonFile(manifestFilePath))
|
|
36
|
+
.then((manifest) => {
|
|
37
|
+
currentVersion = manifest.fdhVersion;
|
|
38
|
+
manifest.fdhVersion = version;
|
|
39
|
+
return fs.writeJson(manifestFilePath, manifest);
|
|
40
|
+
})
|
|
41
|
+
.then(() => setEntryVisibility(manifestFilePath, false))
|
|
42
|
+
.then(() =>
|
|
43
|
+
req.fdt.license.sendTelemetry({
|
|
44
|
+
product: req.command.parent.name,
|
|
45
|
+
type: 'docker',
|
|
46
|
+
version,
|
|
47
|
+
currentVersion,
|
|
48
|
+
action: req.command.name,
|
|
49
|
+
})
|
|
50
|
+
)
|
|
51
|
+
.then(() => destroySpinner());
|
|
52
|
+
}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { fileURLToPath } from 'url';
|
|
3
|
+
|
|
4
|
+
import constants from './utilities/constants.js';
|
|
5
|
+
|
|
6
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
7
|
+
const __dirname = path.dirname(__filename);
|
|
8
|
+
|
|
9
|
+
export default (moduleRegistration, fdhCommand) => {
|
|
10
|
+
fdhCommand
|
|
11
|
+
.addCommand(
|
|
12
|
+
'upgrade',
|
|
13
|
+
path.resolve(__dirname, 'command.upgrade.controller.js')
|
|
14
|
+
)
|
|
15
|
+
.setDescription(
|
|
16
|
+
'Upgrade an existing Fonto Document History instance to the specified version.'
|
|
17
|
+
)
|
|
18
|
+
|
|
19
|
+
.addOption(
|
|
20
|
+
'location',
|
|
21
|
+
'l',
|
|
22
|
+
'The directory of the instance to upgrade. If not set this defaults to the current working directory.',
|
|
23
|
+
false
|
|
24
|
+
)
|
|
25
|
+
.addOption(
|
|
26
|
+
'version',
|
|
27
|
+
null,
|
|
28
|
+
'The version to upgrade to. Can be either a specific version or "nightly". Be warned: nightly can be unstable or may not work at all.',
|
|
29
|
+
true
|
|
30
|
+
)
|
|
31
|
+
|
|
32
|
+
.addExample(
|
|
33
|
+
`${moduleRegistration.getAppInfo().name} ${
|
|
34
|
+
constants.COMMAND_PREFIX
|
|
35
|
+
} upgrade --version x.x.x`,
|
|
36
|
+
'Upgrade the Fonto Document History instance located at the current working directory to version x.x.x.'
|
|
37
|
+
)
|
|
38
|
+
.addExample(
|
|
39
|
+
`${moduleRegistration.getAppInfo().name} ${
|
|
40
|
+
constants.COMMAND_PREFIX
|
|
41
|
+
} upgrade --location /opt/my-instance/ --version x.x.x`,
|
|
42
|
+
'Upgrade the Fonto Document History instance located at "/opt/my-instance/" to version x.x.x.'
|
|
43
|
+
);
|
|
44
|
+
};
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
module.exports = async function versionsCommand(req, res) {
|
|
1
|
+
export default async function versionsCommand(req, res) {
|
|
4
2
|
res.caption(req.command.getLongName());
|
|
5
3
|
|
|
6
4
|
const all = req.options.all;
|
|
@@ -13,4 +11,4 @@ module.exports = async function versionsCommand(req, res) {
|
|
|
13
11
|
destroySpinner();
|
|
14
12
|
res.caption('Fonto Document History versions');
|
|
15
13
|
res.list(all ? sdkVersions.getAll() : sdkVersions.getAllStable(), '-');
|
|
16
|
-
}
|
|
14
|
+
}
|
|
@@ -1,8 +1,15 @@
|
|
|
1
|
-
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { fileURLToPath } from 'url';
|
|
2
3
|
|
|
3
|
-
|
|
4
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
5
|
+
const __dirname = path.dirname(__filename);
|
|
6
|
+
|
|
7
|
+
export default (moduleRegistration, fdhCommand) => {
|
|
4
8
|
fdhCommand
|
|
5
|
-
.addCommand(
|
|
9
|
+
.addCommand(
|
|
10
|
+
'versions',
|
|
11
|
+
path.resolve(__dirname, 'command.versions.controller.js')
|
|
12
|
+
)
|
|
6
13
|
.setDescription('List the available Fonto Document History versions.')
|
|
7
14
|
|
|
8
15
|
.addHiddenOption(
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import fs from 'fs-extra';
|
|
2
|
+
|
|
3
|
+
export default class FontoxmlFdhManifest {
|
|
4
|
+
constructor(fdhVersion) {
|
|
5
|
+
this.fdhVersion = fdhVersion;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
static fromJsonFile(filePath) {
|
|
9
|
+
return fs
|
|
10
|
+
.exists(filePath)
|
|
11
|
+
.then((exists) => {
|
|
12
|
+
if (!exists) {
|
|
13
|
+
throw new Error(`The file ${filePath} does not exist.`);
|
|
14
|
+
}
|
|
15
|
+
})
|
|
16
|
+
.then(() => fs.readJson(filePath))
|
|
17
|
+
.then((content) => {
|
|
18
|
+
FontoxmlFdhManifest.validate(content);
|
|
19
|
+
return new FontoxmlFdhManifest(content.fdhVersion);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
static validate(input) {
|
|
24
|
+
if (!input.fdhVersion) {
|
|
25
|
+
throw new Error(
|
|
26
|
+
"The Fonto Document History manifest file does not contain a 'fdhVersion'."
|
|
27
|
+
);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|