meadow-integration 1.0.38 → 1.0.40

package/source/cli/Default-Meadow-Integration-Configuration.json

@@ -27,7 +27,7 @@
 			"ConnectionPoolLimit": 20
 		}
 	},
-	"SchemaPath": "./schema/Model-Extended.json",
+	"SchemaPath": "",
 	"Sync":
 	{
 		"DefaultSyncMode": "Initial",

package/source/cli/commands/Meadow-Integration-Command-DataClone.js

@@ -1,5 +1,6 @@
 const libCLICommandLineCommand = require('pict-service-commandlineutility').ServiceCommandLineCommand;
 
+const libFs = require('fs');
 const libPath = require('path');
 
 const libMeadowConnectionManager = require('../../services/clone/Meadow-Service-ConnectionManager.js');
@@ -7,6 +8,35 @@ const libMeadowCloneRestClient = require('../../services/clone/Meadow-Service-Re
 const libMeadowSync = require('../../services/clone/Meadow-Service-Sync.js');
 const libSessionManagerSetup = require('../../Meadow-Integration-SessionManagerSetup.js');
 
+// Resolve an env var with the standard `_FILE` suffix fallback for
+// secrets — so docker / k8s secret mounts work without bespoke wiring.
+// Returns undefined when neither the var nor its `_FILE` companion is
+// set; existing JSON-config + CLI-override layers then take effect
+// unchanged.
+function _envOrFile(pVarName)
+{
+	let tmpValue = process.env[pVarName];
+	if (tmpValue !== undefined && tmpValue !== '')
+	{
+		return tmpValue;
+	}
+	let tmpFilePath = process.env[pVarName + '_FILE'];
+	if (tmpFilePath)
+	{
+		try
+		{
+			return libFs.readFileSync(tmpFilePath, 'utf8').replace(/\s+$/, '');
+		}
+		catch (pErr)
+		{
+			// Soft fail — fall through to undefined so the config-file
+			// layer (or CLI flag) still has a chance.
+			console.warn(`Meadow-Integration: ${pVarName}_FILE=${tmpFilePath} unreadable: ${pErr.message}`);
+		}
+	}
+	return undefined;
+}
+
 class DataClone extends libCLICommandLineCommand
 {
 	constructor(pFable, pOptions, pServiceHash)
@@ -23,13 +53,13 @@ class DataClone extends libCLICommandLineCommand
 		this.options.CommandOptions.push({ Name: '-p, --api_password [api_password]', Description: 'The API password to authenticate with.' });
 
 		this.options.CommandOptions.push({ Name: '-d, --db_provider [db_provider]', Description: 'The database provider (MySQL or MSSQL). Default is MySQL.', DefaultValue: 'MySQL' });
-		this.options.CommandOptions.push({ Name: '-dh, --db_host [db_host]', Description: 'The database host address.' });
-		this.options.CommandOptions.push({ Name: '-dp, --db_port [db_port]', Description: 'The database port.' });
-		this.options.CommandOptions.push({ Name: '-du, --db_username [db_username]', Description: 'The database username.' });
-		this.options.CommandOptions.push({ Name: '-dw, --db_password [db_password]', Description: 'The database password.' });
-		this.options.CommandOptions.push({ Name: '-dn, --db_name [db_name]', Description: 'The database name.' });
+		this.options.CommandOptions.push({ Name: '--db_host [db_host]', Description: 'The database host address.' });
+		this.options.CommandOptions.push({ Name: '--db_port [db_port]', Description: 'The database port.' });
+		this.options.CommandOptions.push({ Name: '--db_username [db_username]', Description: 'The database username.' });
+		this.options.CommandOptions.push({ Name: '--db_password [db_password]', Description: 'The database password.' });
+		this.options.CommandOptions.push({ Name: '--db_name [db_name]', Description: 'The database name.' });
 
-		this.options.CommandOptions.push({ Name: '-sp, --schema_path [schema_path]', Description: 'Path to the Meadow extended schema JSON file.' });
+		this.options.CommandOptions.push({ Name: '--schema_path [schema_path]', Description: 'Path to the Meadow extended schema JSON file.' });
 
 		this.options.CommandOptions.push({ Name: '-s, --sync_mode [sync_mode]', Description: 'The sync mode: "Initial" or "Ongoing". Default is "Initial".', DefaultValue: 'Initial' });
 
@@ -42,6 +72,11 @@ class DataClone extends libCLICommandLineCommand
 	{
 		const tmpConfig = JSON.parse(JSON.stringify(this.fable.ProgramConfiguration));
 
+		// Layer 1: env vars (overlay on top of the config-file values).
+		// Layer 2 (CLI flags) below still wins — keeps the existing
+		// precedence intact for standalone CLI users.
+		this._applyEnvOverrides(tmpConfig);
+
 		// Apply command-line overrides for Source (API)
 		if (!tmpConfig.Source)
 		{
@@ -106,6 +141,21 @@ class DataClone extends libCLICommandLineCommand
 			tmpConfig.SchemaPath = this.CommandOptions.schema_path;
 		}
 
+		// Final fallback: a bundled sample schema ships with the
+		// package at <pkg>/schema/default.json (BookStore reference
+		// model). Lets containerized launches succeed out of the box
+		// even when no SchemaPath is configured, so operators get a
+		// "yes it ran" smoke test before wiring their real schema.
+		if (!tmpConfig.SchemaPath)
+		{
+			let tmpBundled = libPath.resolve(__dirname, '..', '..', '..', 'schema', 'default.json');
+			if (libFs.existsSync(tmpBundled))
+			{
+				tmpConfig.SchemaPath = tmpBundled;
+				this.log.info(`No SchemaPath configured; falling back to bundled default at ${tmpBundled}`);
+			}
+		}
+
 		// Sync config
 		if (!tmpConfig.Sync)
 		{
@@ -115,6 +165,52 @@ class DataClone extends libCLICommandLineCommand
 		return tmpConfig;
 	}
 
+	// Overlay MEADOW_INTEGRATION_* env vars onto the config object in
+	// place. Mutates pConfig; called between the config-file load and
+	// the CLI-override pass so the layering stays predictable
+	// (CLI > env > file > defaults). Honors the `_FILE` suffix on
+	// secret-bearing keys.
+	_applyEnvOverrides(pConfig)
+	{
+		// Source (API) ----------------------------------------------
+		let tmpApiServer = _envOrFile('MEADOW_INTEGRATION_API_SERVER');
+		let tmpApiUser   = _envOrFile('MEADOW_INTEGRATION_API_USERNAME');
+		let tmpApiPass   = _envOrFile('MEADOW_INTEGRATION_API_PASSWORD');
+		if (tmpApiServer || tmpApiUser || tmpApiPass)
+		{
+			if (!pConfig.Source) { pConfig.Source = {}; }
+			if (tmpApiServer) { pConfig.Source.ServerURL = tmpApiServer; }
+			if (tmpApiUser)   { pConfig.Source.UserID    = tmpApiUser; }
+			if (tmpApiPass)   { pConfig.Source.Password  = tmpApiPass; }
+		}
+
+		// Destination (Database) ------------------------------------
+		let tmpDbProvider = _envOrFile('MEADOW_INTEGRATION_DB_PROVIDER');
+		let tmpDbHost     = _envOrFile('MEADOW_INTEGRATION_DB_HOST');
+		let tmpDbPort     = _envOrFile('MEADOW_INTEGRATION_DB_PORT');
+		let tmpDbUser     = _envOrFile('MEADOW_INTEGRATION_DB_USERNAME');
+		let tmpDbPass     = _envOrFile('MEADOW_INTEGRATION_DB_PASSWORD');
+		let tmpDbName     = _envOrFile('MEADOW_INTEGRATION_DB_NAME');
+		let tmpHasDb = tmpDbProvider || tmpDbHost || tmpDbPort || tmpDbUser || tmpDbPass || tmpDbName;
+		if (tmpHasDb)
+		{
+			if (!pConfig.Destination) { pConfig.Destination = {}; }
+			if (tmpDbProvider) { pConfig.Destination.Provider = tmpDbProvider; }
+			let tmpProviderKey = pConfig.Destination.Provider || 'MySQL';
+			if (!pConfig.Destination[tmpProviderKey]) { pConfig.Destination[tmpProviderKey] = {}; }
+			let tmpProviderCfg = pConfig.Destination[tmpProviderKey];
+			if (tmpDbHost) { tmpProviderCfg.server   = tmpDbHost; }
+			if (tmpDbPort) { tmpProviderCfg.port     = parseInt(tmpDbPort, 10); }
+			if (tmpDbUser) { tmpProviderCfg.user     = tmpDbUser; }
+			if (tmpDbPass) { tmpProviderCfg.password = tmpDbPass; }
+			if (tmpDbName) { tmpProviderCfg.database = tmpDbName; }
+		}
+
+		// Schema path -----------------------------------------------
+		let tmpSchemaPath = _envOrFile('MEADOW_INTEGRATION_SCHEMA_PATH');
+		if (tmpSchemaPath) { pConfig.SchemaPath = tmpSchemaPath; }
+	}
+
 	onRunAsync(fCallback)
 	{
 		const tmpConfig = this._resolveConfig();

package/source/views/PictView-MeadowMappingEditor.js

@@ -106,7 +106,7 @@ const _ViewConfiguration =
 		}
 		.meadow-mapping-btn-primary {
 			background: var(--facto-brand, #18a5a0);
-			color: #fff;
+			color: var(--theme-color-background-panel, #fff);
 			border-color: var(--facto-brand, #18a5a0);
 		}
 		.meadow-mapping-btn-primary:hover {
@@ -121,9 +121,9 @@ const _ViewConfiguration =
 			background: var(--facto-border-subtle, #e8ddc8);
 		}
 		.meadow-mapping-btn-danger {
-			background: #e74c3c;
-			color: #fff;
-			border-color: #e74c3c;
+			background: var(--theme-color-status-error, #e74c3c);
+			color: var(--theme-color-background-panel, #fff);
+			border-color: var(--theme-color-status-error, #e74c3c);
 		}
 		.meadow-mapping-btn-danger:hover {
 			opacity: 0.88;
@@ -147,7 +147,7 @@ const _ViewConfiguration =
 		}
 		.meadow-schema-mode-tab.active {
 			background: var(--facto-brand, #18a5a0);
-			color: #fff;
+			color: var(--theme-color-background-panel, #fff);
 			border-color: var(--facto-brand, #18a5a0);
 		}
 		.meadow-section-title {

package/source/views/flow-cards/FlowCard-SolverExpression.js

@@ -43,7 +43,7 @@ class FlowCardSolverExpression extends libPictFlowCard
 				BodyContent:
 				{
 					ContentType: 'html',
-					Template: '<div style="font-size:10px; padding:2px 4px; color:#ccc; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; max-width:200px;">{~D:Record.Data.SolverExpression~}</div>'
+					Template: '<div style="font-size:10px; padding:2px 4px; color:var(--theme-color-border-default, #ccc); overflow:hidden; white-space:nowrap; text-overflow:ellipsis; max-width:200px;">{~D:Record.Data.SolverExpression~}</div>'
 				},
 				PropertiesPanel:
 				{
@@ -53,7 +53,7 @@ class FlowCardSolverExpression extends libPictFlowCard
 					Title: 'Solver Expression',
 					Configuration:
 					{
-						Template: '<div style="padding:8px;"><label style="display:block; margin-bottom:4px; font-weight:bold; font-size:12px;">Solver Expression</label><textarea id="FlowCard-SOL-{~D:Record.Hash~}" style="width:100%; height:80px; font-family:monospace; font-size:12px; resize:vertical; background:#1a1a2e; color:#e0e0e0; border:1px solid #444; border-radius:4px; padding:6px;" onchange="(function(el){var n=pict.views[\'MeadowMapping-Flow\'];if(n&&n._FlowData){for(var i=0;i<n._FlowData.Nodes.length;i++){if(n._FlowData.Nodes[i].Hash===\'{~D:Record.Hash~}\'){n._FlowData.Nodes[i].Data.SolverExpression=el.value;if(typeof n.renderFlow===\'function\')n.renderFlow();break;}}}})(this)">{~D:Record.Data.SolverExpression~}</textarea><div style="font-size:10px; color:#888; margin-top:4px;">Example: IF(IncomingRecord.Type == \'Premium\', \'GOLD\', \'SILVER\')</div></div>'
+						Template: '<div style="padding:8px;"><label style="display:block; margin-bottom:4px; font-weight:bold; font-size:12px;">Solver Expression</label><textarea id="FlowCard-SOL-{~D:Record.Hash~}" style="width:100%; height:80px; font-family:monospace; font-size:12px; resize:vertical; background:#1a1a2e; color:var(--theme-color-border-default, #e0e0e0); border:1px solid var(--theme-color-text-secondary, #444); border-radius:4px; padding:6px;" onchange="(function(el){var n=pict.views[\'MeadowMapping-Flow\'];if(n&&n._FlowData){for(var i=0;i<n._FlowData.Nodes.length;i++){if(n._FlowData.Nodes[i].Hash===\'{~D:Record.Hash~}\'){n._FlowData.Nodes[i].Data.SolverExpression=el.value;if(typeof n.renderFlow===\'function\')n.renderFlow();break;}}}})(this)">{~D:Record.Data.SolverExpression~}</textarea><div style="font-size:10px; color:var(--theme-color-text-muted, #888); margin-top:4px;">Example: IF(IncomingRecord.Type == \'Premium\', \'GOLD\', \'SILVER\')</div></div>'
 					}
 				}
 			},

package/source/views/flow-cards/FlowCard-TemplateExpression.js

@@ -42,7 +42,7 @@ class FlowCardTemplateExpression extends libPictFlowCard
 				BodyContent:
 				{
 					ContentType: 'html',
-					Template: '<div style="font-size:10px; padding:2px 4px; color:#ccc; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; max-width:200px;">{~D:Record.Data.TemplateExpression~}</div>'
+					Template: '<div style="font-size:10px; padding:2px 4px; color:var(--theme-color-border-default, #ccc); overflow:hidden; white-space:nowrap; text-overflow:ellipsis; max-width:200px;">{~D:Record.Data.TemplateExpression~}</div>'
 				},
 				PropertiesPanel:
 				{
@@ -52,7 +52,7 @@ class FlowCardTemplateExpression extends libPictFlowCard
 					Title: 'Template Expression',
 					Configuration:
 					{
-						Template: '<div style="padding:8px;"><label style="display:block; margin-bottom:4px; font-weight:bold; font-size:12px;">Template Expression</label><textarea id="FlowCard-TPL-{~D:Record.Hash~}" style="width:100%; height:80px; font-family:monospace; font-size:12px; resize:vertical; background:#1a1a2e; color:#e0e0e0; border:1px solid #444; border-radius:4px; padding:6px;" onchange="(function(el){var n=pict.views[\'MeadowMapping-Flow\'];if(n&&n._FlowData){for(var i=0;i<n._FlowData.Nodes.length;i++){if(n._FlowData.Nodes[i].Hash===\'{~D:Record.Hash~}\'){n._FlowData.Nodes[i].Data.TemplateExpression=el.value;if(typeof n.renderFlow===\'function\')n.renderFlow();break;}}}})(this)">{~D:Record.Data.TemplateExpression~}</textarea><div style="font-size:10px; color:#888; margin-top:4px;">Use {~D:Record.FieldName~} syntax. Example: {~D:Record.Name~} in {~D:Record.City~}</div></div>'
+						Template: '<div style="padding:8px;"><label style="display:block; margin-bottom:4px; font-weight:bold; font-size:12px;">Template Expression</label><textarea id="FlowCard-TPL-{~D:Record.Hash~}" style="width:100%; height:80px; font-family:monospace; font-size:12px; resize:vertical; background:#1a1a2e; color:var(--theme-color-border-default, #e0e0e0); border:1px solid var(--theme-color-text-secondary, #444); border-radius:4px; padding:6px;" onchange="(function(el){var n=pict.views[\'MeadowMapping-Flow\'];if(n&&n._FlowData){for(var i=0;i<n._FlowData.Nodes.length;i++){if(n._FlowData.Nodes[i].Hash===\'{~D:Record.Hash~}\'){n._FlowData.Nodes[i].Data.TemplateExpression=el.value;if(typeof n.renderFlow===\'function\')n.renderFlow();break;}}}})(this)">{~D:Record.Data.TemplateExpression~}</textarea><div style="font-size:10px; color:var(--theme-color-text-muted, #888); margin-top:4px;">Use {~D:Record.FieldName~} syntax. Example: {~D:Record.Name~} in {~D:Record.City~}</div></div>'
 					}
 				}
 			},