retold-harness 1.1.8 → 1.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "retold-harness",
-    "version": "1.1.8",
+    "version": "1.1.10",
     "description": "Restful API harness.  Serves on 8086.",
     "main": "source/Retold-Harness.js",
     "bin": {
@@ -36,24 +36,24 @@
     "homepage": "https://github.com/stevenvelozo/retold-harness#readme",
     "dependencies": {
         "blessed": "^0.1.81",
-        "meadow-connection-dgraph": "^1.0.2",
-        "meadow-connection-mongodb": "^1.0.2",
-        "meadow-connection-mssql": "^1.0.20",
-        "meadow-connection-mysql": "^1.0.14",
-        "meadow-connection-postgresql": "^1.0.2",
-        "meadow-connection-solr": "^1.0.2",
-        "meadow-connection-sqlite": "^1.0.18",
-        "meadow-integration": "^1.0.34",
-        "orator-authentication": "^1.0.0",
-        "pict": "^1.0.357",
+        "meadow-connection-dgraph": "^1.0.3",
+        "meadow-connection-mongodb": "^1.0.3",
+        "meadow-connection-mssql": "^1.0.22",
+        "meadow-connection-mysql": "^1.0.18",
+        "meadow-connection-postgresql": "^1.0.4",
+        "meadow-connection-solr": "^1.0.3",
+        "meadow-connection-sqlite": "^1.0.19",
+        "meadow-integration": "^1.0.38",
+        "orator-authentication": "^1.0.1",
+        "pict": "^1.0.365",
         "pict-application": "^1.0.33",
         "pict-terminalui": "^0.0.3",
-        "pict-view": "^1.0.67",
-        "retold-data-service": "^2.0.42"
+        "pict-view": "^1.0.68",
+        "retold-data-service": "^2.1.0"
     },
     "devDependencies": {
         "pict-docuserve": "^0.1.5",
-        "quackage": "^1.1.0",
+        "quackage": "^1.1.2",
         "stricture": "^4.0.2",
         "supertest": "^7.2.2"
     },

package/source/management-tool/Retold-Harness-Management-Tool.js

@@ -774,13 +774,48 @@ function parseArgvHarnessPath()
 	return null;
 }
 
+/**
+* Walk up from pStartPath looking for a retold monorepo layout that
+* contains a retold-harness source checkout at
+* `<root>/modules/meadow/retold-harness`. Returns the absolute path of
+* the harness if found, or null.
+*
+* @param {string} pStartPath
+* @returns {string|null}
+*/
+function findRetoldSourceHarness(pStartPath)
+{
+	let tmpCurrent = libPath.resolve(pStartPath);
+
+	while (true)
+	{
+		let tmpCandidate = libPath.join(tmpCurrent, 'modules', 'meadow', 'retold-harness');
+		if (isValidHarnessPath(tmpCandidate))
+		{
+			return tmpCandidate;
+		}
+
+		let tmpParent = libPath.dirname(tmpCurrent);
+		if (tmpParent === tmpCurrent)
+		{
+			return null;
+		}
+		tmpCurrent = tmpParent;
+	}
+}
+
 /**
 * Resolve the retold-harness directory using a priority chain:
 *
 *   1. --harness-path CLI argument
 *   2. Current working directory (if it IS the harness)
 *   3. ./retold-harness child of CWD (running from parent directory)
-*   4. Parent of this source directory (management tool lives inside the harness)
+*   4. Local retold-monorepo source checkout walking up from CWD
+*      (modules/meadow/retold-harness). Preferred over the installed
+*      node_modules copy so the tool always runs the live source.
+*   5. Parent of this source directory (management tool lives inside the
+*      harness — matches both the source checkout when launched from
+*      there and the node_modules copy when installed elsewhere)
 *
 * @returns {string|null}
 */
@@ -807,10 +842,26 @@ function resolveHarnessPath()
 		return tmpCwdChild;
 	}
 
-	// 4. Parent of this source directory (management tool lives inside retold-harness/source/management-tool/)
+	// 4. Local retold monorepo source (prefer over node_modules so we
+	//    always run the editable checkout rather than a stale install)
+	let tmpSourceHarness = findRetoldSourceHarness(tmpCwd);
+	if (tmpSourceHarness)
+	{
+		return tmpSourceHarness;
+	}
+
+	// 5. Parent of this source directory (management tool lives inside retold-harness/source/management-tool/)
 	let tmpParent = libPath.resolve(__dirname, '..');
 	if (isValidHarnessPath(tmpParent))
 	{
+		// If we're running from an installed node_modules copy, try to
+		// walk up further to locate a sibling retold monorepo and prefer
+		// that over the installed snapshot.
+		let tmpSourceFromInstall = findRetoldSourceHarness(tmpParent);
+		if (tmpSourceFromInstall && tmpSourceFromInstall !== tmpParent)
+		{
+			return tmpSourceFromInstall;
+		}
 		return tmpParent;
 	}
 

package/source/providers/Retold-Harness-Service-MeadowProviderConfigurator.js

@@ -49,6 +49,84 @@ class RetoldHarnessMeadowProviderConfigurator extends libFableServiceProviderBas
 		return fCallback('initializeSchema not implemented');
 	}
 
+	/**
+	 * Split a multi-statement SQL string into individual statements.
+	 * Respects single-quoted string literals so that a ';' inside a
+	 * string (e.g. 'Frankenstein; or, The Modern Prometheus') is not
+	 * treated as a statement terminator. Recognizes both backslash
+	 * escapes (\') and doubled single-quote escapes ('').
+	 *
+	 * @param {string} pSQL - The raw SQL text
+	 * @returns {Array<string>} - Trimmed, non-empty, non-comment statements
+	 */
+	splitSQLStatements(pSQL)
+	{
+		let tmpStatements = [];
+		let tmpCurrent = '';
+		let tmpInString = false;
+		let tmpEscape = false;
+
+		for (let i = 0; i < pSQL.length; i++)
+		{
+			let tmpChar = pSQL[i];
+
+			if (tmpInString)
+			{
+				tmpCurrent += tmpChar;
+
+				if (tmpEscape)
+				{
+					tmpEscape = false;
+					continue;
+				}
+
+				if (tmpChar === '\\')
+				{
+					tmpEscape = true;
+					continue;
+				}
+
+				if (tmpChar === "'")
+				{
+					// Handle doubled single-quote '' as an escape for a literal quote
+					if (pSQL[i + 1] === "'")
+					{
+						tmpCurrent += pSQL[i + 1];
+						i++;
+						continue;
+					}
+					tmpInString = false;
+				}
+				continue;
+			}
+
+			if (tmpChar === "'")
+			{
+				tmpInString = true;
+				tmpCurrent += tmpChar;
+				continue;
+			}
+
+			if (tmpChar === ';')
+			{
+				tmpStatements.push(tmpCurrent);
+				tmpCurrent = '';
+				continue;
+			}
+
+			tmpCurrent += tmpChar;
+		}
+
+		if (tmpCurrent.trim().length > 0)
+		{
+			tmpStatements.push(tmpCurrent);
+		}
+
+		return tmpStatements
+			.map((pStatement) => pStatement.trim())
+			.filter((pStatement) => pStatement.length > 0 && !pStatement.startsWith('--'));
+	}
+
 	/**
 	 * Initialize the RetoldDataService with the schema provider's options.
 	 * This is a base implementation that works for all providers.

package/source/providers/Retold-Harness-Service-Provider-MSSQL.js

@@ -97,14 +97,16 @@ class RetoldHarnessProviderMSSQL extends libRetoldHarnessMeadowProviderConfigura
 		tmpAnticipate.anticipate(
 			(fStepComplete) =>
 			{
-				let tmpSeedCheckQuery = tmpSchemaProvider.getSeedCheckQuery();
+				let tmpSeedCheckTable = tmpSchemaProvider.getSeedCheckTable();
 
-				if (!tmpSeedCheckQuery)
+				if (!tmpSeedCheckTable)
 				{
-					this.log.info('No seed check query provided, skipping seed.');
+					this.log.info('No seed check table provided, skipping seed.');
 					return fStepComplete();
 				}
 
+				let tmpSeedCheckQuery = `SELECT COUNT(*) AS cnt FROM [${tmpSeedCheckTable}]`;
+
 				tmpPool.request().query(tmpSeedCheckQuery)
 					.then(
 						(pResult) =>

package/source/providers/Retold-Harness-Service-Provider-MySQL.js

@@ -97,14 +97,16 @@ class RetoldHarnessProviderMySQL extends libRetoldHarnessMeadowProviderConfigura
 		tmpAnticipate.anticipate(
 			(fStepComplete) =>
 			{
-				let tmpSeedCheckQuery = tmpSchemaProvider.getSeedCheckQuery();
+				let tmpSeedCheckTable = tmpSchemaProvider.getSeedCheckTable();
 
-				if (!tmpSeedCheckQuery)
+				if (!tmpSeedCheckTable)
 				{
-					this.log.info('No seed check query provided, skipping seed.');
+					this.log.info('No seed check table provided, skipping seed.');
 					return fStepComplete();
 				}
 
+				let tmpSeedCheckQuery = `SELECT COUNT(*) AS cnt FROM \`${tmpSeedCheckTable}\``;
+
 				tmpPool.query(tmpSeedCheckQuery,
 					(pError, pRows) =>
 					{
@@ -134,9 +136,10 @@ class RetoldHarnessProviderMySQL extends libRetoldHarnessMeadowProviderConfigura
 						this.log.info('Seeding initial data into MySQL...');
 						let tmpSeedSQL = libFS.readFileSync(tmpSeedSQLPath, 'utf8');
 
-						// MySQL supports multiple statements in a single query if multipleStatements is enabled
-						// Split by semicolons and execute each statement
-						let tmpStatements = tmpSeedSQL.split(';').map((pStatement) => pStatement.trim()).filter((pStatement) => pStatement.length > 0);
+						// Split into individual statements; splitSQLStatements
+						// respects string literals so embedded semicolons
+						// (e.g. in book titles) do not terminate a statement.
+						let tmpStatements = this.splitSQLStatements(tmpSeedSQL);
 
 						let tmpStatementIndex = 0;
 						let tmpExecuteNext = () =>

package/source/providers/Retold-Harness-Service-Provider-PostgreSQL.js

@@ -97,14 +97,19 @@ class RetoldHarnessProviderPostgreSQL extends libRetoldHarnessMeadowProviderConf
 		tmpAnticipate.anticipate(
 			(fStepComplete) =>
 			{
-				let tmpSeedCheckQuery = tmpSchemaProvider.getSeedCheckQuery();
+				let tmpSeedCheckTable = tmpSchemaProvider.getSeedCheckTable();
 
-				if (!tmpSeedCheckQuery)
+				if (!tmpSeedCheckTable)
 				{
-					this.log.info('No seed check query provided, skipping seed.');
+					this.log.info('No seed check table provided, skipping seed.');
 					return fStepComplete();
 				}
 
+				// PostgreSQL folds unquoted identifiers to lowercase; the
+				// Meadow PG connector creates mixed-case tables, so we must
+				// quote the identifier here or the lookup will miss.
+				let tmpSeedCheckQuery = `SELECT COUNT(*) AS cnt FROM "${tmpSeedCheckTable}"`;
+
 				tmpPool.query(tmpSeedCheckQuery,
 					(pError, pResult) =>
 					{
@@ -134,8 +139,10 @@ class RetoldHarnessProviderPostgreSQL extends libRetoldHarnessMeadowProviderConf
 						this.log.info('Seeding initial data into PostgreSQL...');
 						let tmpSeedSQL = libFS.readFileSync(tmpSeedSQLPath, 'utf8');
 
-						// Split by semicolons and execute each statement
-						let tmpStatements = tmpSeedSQL.split(';').map((pStatement) => pStatement.trim()).filter((pStatement) => pStatement.length > 0 && !pStatement.startsWith('--'));
+						// Split into individual statements; splitSQLStatements
+						// respects string literals so embedded semicolons do
+						// not terminate a statement prematurely.
+						let tmpStatements = this.splitSQLStatements(tmpSeedSQL);
 
 						let tmpStatementIndex = 0;
 						let tmpExecuteNext = () =>

package/source/schemas/Retold-Harness-Service-Schema-Bookstore.js

@@ -25,9 +25,9 @@ class RetoldHarnessSchemaBookstore extends libRetoldHarnessSchemaProvider
 		return libPath.join(__dirname, 'bookstore');
 	}
 
-	getSeedCheckQuery()
+	getSeedCheckTable()
 	{
-		return 'SELECT COUNT(*) AS cnt FROM Book';
+		return 'Book';
 	}
 
 	generateTables(pDB, fCallback)

package/source/schemas/Retold-Harness-Service-Schema-Entertainment.js

@@ -27,9 +27,9 @@ class RetoldHarnessSchemaEntertainment extends libRetoldHarnessSchemaProvider
 		return libPath.join(__dirname, 'entertainment');
 	}
 
-	getSeedCheckQuery()
+	getSeedCheckTable()
 	{
-		return 'SELECT COUNT(*) AS cnt FROM DataSource';
+		return 'DataSource';
 	}
 
 	generateTables(pDB, fCallback)

package/source/schemas/Retold-Harness-Service-Schema-USFederalData.js

@@ -26,9 +26,9 @@ class RetoldHarnessSchemaUSFederalData extends libRetoldHarnessSchemaProvider
 		return libPath.join(__dirname, 'us-federal-data');
 	}
 
-	getSeedCheckQuery()
+	getSeedCheckTable()
 	{
-		return 'SELECT COUNT(*) AS cnt FROM CensusRegion';
+		return 'CensusRegion';
 	}
 
 	generateTables(pDB, fCallback)

package/source/schemas/Retold-Harness-Service-SchemaProvider.js

@@ -84,13 +84,16 @@ class RetoldHarnessSchemaProvider extends libFableServiceProviderBase
 	}
 
 	/**
-	 * Get a SQL query that checks whether seed data has already been loaded.
-	 * Should return a query that produces a { cnt } result where cnt > 0
-	 * means data exists. Return false if seeding should always run.
+	 * Get the unquoted name of a table whose row count indicates whether
+	 * seed data has already been loaded. Each SQL provider quotes the
+	 * identifier per its own convention (backticks, double-quotes, brackets)
+	 * so case-sensitive engines like PostgreSQL find the table.
 	 *
-	 * @returns {string|boolean} SQL query string or false
+	 * Return false if seeding should always run.
+	 *
+	 * @returns {string|boolean} Table name or false
 	 */
-	getSeedCheckQuery()
+	getSeedCheckTable()
 	{
 		return false;
 	}

package/source/schemas/bookstore/BookStore.ddl

@@ -124,7 +124,7 @@ $Country 64
 &DeleteDate
 #DeletingIDUser
 $Name 200
-$Description 1024
+*Description
 $ContactName 200
 $ContactEmail 200
 $ContactPhone 32

package/source/schemas/bookstore/MeadowModel-Extended.json

@@ -3385,8 +3385,7 @@
                 },
                 {
                     "Column": "Description",
-                    "DataType": "String",
-                    "Size": "1024"
+                    "DataType": "Text"
                 },
                 {
                     "Column": "ContactName",
@@ -3492,7 +3491,7 @@
                     {
                         "Column": "Description",
                         "Type": "String",
-                        "Size": "1024"
+                        "Size": "Default"
                     },
                     {
                         "Column": "ContactName",
@@ -3608,7 +3607,7 @@
                         },
                         "Description": {
                             "type": "string",
-                            "size": "1024"
+                            "size": "Default"
                         },
                         "ContactName": {
                             "type": "string",
@@ -3701,8 +3700,7 @@
                             },
                             {
                                 "Column": "Description",
-                                "DataType": "String",
-                                "Size": "1024"
+                                "DataType": "Text"
                             },
                             {
                                 "Column": "ContactName",
@@ -3808,7 +3806,7 @@
                                 {
                                     "Column": "Description",
                                     "Type": "String",
-                                    "Size": "1024"
+                                    "Size": "Default"
                                 },
                                 {
                                     "Column": "ContactName",
@@ -3924,7 +3922,7 @@
                                     },
                                     "Description": {
                                         "type": "string",
-                                        "size": "1024"
+                                        "size": "Default"
                                     },
                                     "ContactName": {
                                         "type": "string",

package/source/schemas/bookstore/MeadowModel.json

@@ -576,8 +576,7 @@
                 },
                 {
                     "Column": "Description",
-                    "DataType": "String",
-                    "Size": "1024"
+                    "DataType": "Text"
                 },
                 {
                     "Column": "ContactName",

package/source/schemas/bookstore/Schema.json

@@ -3385,8 +3385,7 @@
                 },
                 {
                     "Column": "Description",
-                    "DataType": "String",
-                    "Size": "1024"
+                    "DataType": "Text"
                 },
                 {
                     "Column": "ContactName",
@@ -3492,7 +3491,7 @@
                     {
                         "Column": "Description",
                         "Type": "String",
-                        "Size": "1024"
+                        "Size": "Default"
                     },
                     {
                         "Column": "ContactName",
@@ -3608,7 +3607,7 @@
                         },
                         "Description": {
                             "type": "string",
-                            "size": "1024"
+                            "size": "Default"
                         },
                         "ContactName": {
                             "type": "string",
@@ -3701,8 +3700,7 @@
                             },
                             {
                                 "Column": "Description",
-                                "DataType": "String",
-                                "Size": "1024"
+                                "DataType": "Text"
                             },
                             {
                                 "Column": "ContactName",
@@ -3808,7 +3806,7 @@
                                 {
                                     "Column": "Description",
                                     "Type": "String",
-                                    "Size": "1024"
+                                    "Size": "Default"
                                 },
                                 {
                                     "Column": "ContactName",
@@ -3924,7 +3922,7 @@
                                     },
                                     "Description": {
                                         "type": "string",
-                                        "size": "1024"
+                                        "size": "Default"
                                     },
                                     "ContactName": {
                                         "type": "string",