@salesforce/templates 66.10.4 → 66.11.1

package/lib/utils/createUtil.d.ts

@@ -1,6 +1,8 @@
 import * as nodeFs from 'fs';
 export declare class CreateUtil {
     static checkInputs(flagValue: string): string;
+    /** Validate an SObject API name (e.g. Account, MyObject__c, ns__MyObject__c). */
+    static checkSObjectType(sobjectType: string): void;
     static getCommandTemplatesForFiletype(filetype: RegExp, command: string, fs?: typeof nodeFs, templatesRootPath?: string): string[];
     /** Get the names of directories that contain matching template files.
      * This will look in directories under the command/subdir folder.

package/lib/utils/createUtil.js

@@ -31,6 +31,13 @@ class CreateUtil {
         }
         return '';
     }
+    /** Validate an SObject API name (e.g. Account, MyObject__c, ns__MyObject__c). */
+    static checkSObjectType(sobjectType) {
+        const sObjectRegExp = /^[A-Za-z]\w*$/;
+        if (!sObjectRegExp.test(sobjectType) || sobjectType.endsWith('_')) {
+            throw new Error(i18n_1.nls.localize('InvalidSObjectType', sobjectType));
+        }
+    }
     // TODO: switch filetype to a string instead of regex
     static getCommandTemplatesForFiletype(filetype, command, fs = nodeFs, templatesRootPath) {
         var _a;

package/lib/utils/createUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"createUtil.js","sourceRoot":"","sources":["../../src/utils/createUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createUtil.js","sourceRoot":"","sources":["../../src/utils/createUtil.ts"],"names":[],"mappings":"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"}

package/lib/utils/types.d.ts

@@ -70,10 +70,18 @@ export interface TemplateOptions {
 export interface AnalyticsTemplateOptions extends TemplateOptions {
     templatename: string;
 }
-export interface ApexClassOptions extends TemplateOptions {
-    template: 'DefaultApexClass' | 'BasicUnitTest' | 'ApexUnitTest' | 'ApexException' | 'InboundEmailService';
+type ApexClassBaseOptions = TemplateOptions & {
     classname: string;
-}
+};
+type NonBatchableApexClassOptions = ApexClassBaseOptions & {
+    template: 'DefaultApexClass' | 'BasicUnitTest' | 'ApexUnitTest' | 'ApexException' | 'InboundEmailService' | 'Queueable';
+    sobjecttype?: never;
+};
+type BatchableApexClassOptions = ApexClassBaseOptions & {
+    template: 'Batchable';
+    sobjecttype?: string;
+};
+export type ApexClassOptions = NonBatchableApexClassOptions | BatchableApexClassOptions;
 type ApexTriggerEvent = 'before insert' | 'before update' | 'before delete' | 'after insert' | 'after update' | 'after delete' | 'after undelete';
 export interface ApexTriggerOptions extends TemplateOptions {
     triggername: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/templates",
-  "version": "66.10.4",
+  "version": "66.11.1",
   "description": "Salesforce JS library for templates",
   "bugs": "https://github.com/forcedotcom/salesforcedx-templates/issues",
   "main": "lib/index.js",
@@ -18,7 +18,7 @@
     "hpagent": "^1.2.0",
     "mime-types": "^3.0.2",
     "proxy-from-env": "^1.1.0",
-    "tar": "^7.5.19",
+    "tar": "^7.5.20",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
@@ -27,7 +27,7 @@
     "@salesforce/prettier-config": "^0.0.4",
     "@salesforce/ui-bundle-template-app-react-template-b2e": "^10.24.0",
     "@salesforce/ui-bundle-template-app-react-template-b2x": "^10.12.2",
-    "@salesforce/ui-bundle-template-base-angular-app": "^11.1.0",
+    "@salesforce/ui-bundle-template-base-angular-app": "^11.22.1",
     "@salesforce/ui-bundle-template-base-react-app": "^10.24.0",
     "@salesforce/ui-bundle-template-base-web-app": "^10.24.0",
     "@types/chai-as-promised": "^7.1.8",

package/lib/templates/uiBundles/angularbasic/src/app/api/graphql-client.service.ts

@@ -1,51 +0,0 @@
-import { Injectable } from '@angular/core';
-import { createDataSDK } from '@salesforce/platform-sdk';
-
-/**
- * True when the operation's first definition is a `mutation`. Strips GraphQL
- * comments first so a leading `# ...` line can't mask the keyword. Queries
- * (named or anonymous `{ ... }` shorthand) and subscriptions fall through to
- * query().
- */
-function isMutation(operation: string): boolean {
-	return /^\s*mutation\b/.test(operation.replace(/#[^\n\r]*/g, ''));
-}
-
-/**
- * Thin GraphQL client: createDataSDK + sdk.graphql with centralized error
- * handling. Mutations are routed to sdk.graphql.mutate and everything else to
- * sdk.graphql.query (the SDK rejects an operation sent to the wrong method).
- * Use with gql-tagged queries and generated operation types for type-safe calls.
- *
- * Injectable mirror of the React template's src/api/graphqlClient.ts so both
- * frameworks share the same platform-sdk data-fetch contract.
- */
-@Injectable({ providedIn: 'root' })
-export class GraphqlClient {
-	async execute<TData, TVariables = Record<string, unknown>>(
-		operation: string,
-		variables?: TVariables,
-	): Promise<TData> {
-		const data = await createDataSDK();
-		const result = isMutation(operation)
-			? await data.graphql!.mutate<TData, TVariables>({
-					mutation: operation,
-					variables,
-				})
-			: await data.graphql!.query<TData, TVariables>({
-					query: operation,
-					variables,
-				});
-
-		if (result.errors?.length) {
-			const msg = result.errors.map((e) => e.message).join('; ');
-			throw new Error(`GraphQL Error: ${msg}`);
-		}
-
-		if (result.data == null) {
-			throw new Error('GraphQL response data is null');
-		}
-
-		return result.data;
-	}
-}

package/lib/templates/uiBundles/angularbasic/src/styles.css

@@ -1,12 +0,0 @@
-@import 'tailwindcss';
-
-@layer base {
-	html,
-	body {
-		@apply min-h-screen;
-	}
-
-	body {
-		@apply antialiased bg-white;
-	}
-}