@aerogel/cli 0.0.0-next.5953e1862a7c89a8fc80da087467d67d4f4e8c73 → 0.0.0-next.6c02970f90d4e979a72530f1fa0c650785d6538f

package/templates/app/cypress/cypress.config.ts

@@ -1,4 +1,4 @@
-import install from '@aerogel/cypress/dist/plugin';
+import { setupAerogelNodeEvents } from '@aerogel/cypress/config';
 import { defineConfig } from 'cypress';
 
 export default defineConfig({
@@ -9,8 +9,6 @@ export default defineConfig({
             runMode: 3,
             openMode: 0,
         },
-        setupNodeEvents(on) {
-            install(on);
-        },
+        setupNodeEvents: setupAerogelNodeEvents,
     },
 });

package/templates/app/cypress/support/e2e.ts

@@ -1,3 +1 @@
-import install from '@aerogel/cypress';
-
-install();
+import '@aerogel/cypress/support';

package/templates/app/cypress/tsconfig.json

@@ -3,10 +3,12 @@
         "target": "es5",
         "lib": ["es5", "dom"],
         "types": ["cypress", "node"],
+        "strict": true,
         "baseUrl": ".",
         "paths": {
+            "@/*": ["../src/*"],
             "@cy/*": ["./*"]
         }
     },
-    "include": ["**/*.ts"]
+    "include": ["**/*.ts", "../src/**/*.ts"]
 }

package/templates/app/package.json

@@ -11,10 +11,10 @@
         "cy:test-snapshots": "docker run -it -u `id -u ${whoami}` -e CYPRESS_SNAPSHOTS=true -v ./:/app -w /app cypress/base:18.16.0 sh -c \"npx cypress install && npm run cy:test\"",
         "cy:test-snapshots:ci": "docker run -e CYPRESS_SNAPSHOTS=true -v ./:/app -w /app cypress/base:18.16.0 sh -c \"npx cypress install && npm run cy:test\"",
         "dev": "vite",
-        "lint": "noeldemartin-lint src",
+        "lint": "noeldemartin-lint src cypress",
         "test": "vitest --run",
         "test:ci": "vitest --run --reporter verbose",
-        "test:serve-app": "vite --port 5001"
+        "test:serve-app": "vite --port 5001 --mode testing"
     },
     "dependencies": {
         "@aerogel/core": "<% &dependencies.aerogelCore %>",
@@ -46,6 +46,7 @@
         "prettier-eslint-cli": "^7.1.0",
         "prettier-plugin-tailwindcss": "^0.2.8",
         "start-server-and-test": "^2.0.0",
+        "typescript": "~5.4",
         "unplugin-icons": "^0.16.3",
         "unplugin-vue-components": "^0.24.1",
         "vite": "^4.3.0",

package/templates/app/src/main.ts

@@ -1,13 +1,13 @@
 import i18n from '@aerogel/plugin-i18n';
 import soukai from '@aerogel/plugin-soukai';
-import { bootstrapApplication } from '@aerogel/core';
+import { bootstrap } from '@aerogel/core';
 
 import './assets/css/styles.css';
 import App from './App.vue';
 
-bootstrapApplication(App, {
+bootstrap(App, {
     plugins: [
         i18n({ messages: import.meta.glob('@/lang/*.yaml') }),
-        soukai({ models: import.meta.glob('@/models/*', { eager: true }) }),
+        soukai({ models: import.meta.glob(['@/models/*', '!**/*.test.ts'], { eager: true }) }),
     ],
 });

package/templates/component-button/[component.name].vue

@@ -0,0 +1,42 @@
+<template>
+    <AGHeadlessButton :class="variantClasses" :disabled="disabled">
+        <slot />
+    </AGHeadlessButton>
+</template>
+
+<script setup lang="ts">
+import { Colors, booleanProp, enumProp, removeInteractiveClasses } from '@aerogel/core';
+import { computed } from 'vue';
+
+const props = defineProps({
+    color: enumProp(Colors, Colors.Primary),
+    disabled: booleanProp(),
+});
+
+const colorClasses = computed(() => {
+    switch (props.color) {
+        case Colors.Secondary:
+            // Add your custom color classes here.
+            return '';
+        case Colors.Clear:
+            // Add your custom color classes here.
+            return '';
+        case Colors.Danger:
+            // Add your custom color classes here.
+            return '';
+        case Colors.Primary:
+        default:
+            // Add your custom color classes here.
+            return '';
+    }
+});
+
+const variantClasses = computed(() => {
+    if (props.disabled) {
+        // Add additional classes for disabled state here.
+        return removeInteractiveClasses(colorClasses.value);
+    }
+
+    return colorClasses.value;
+});
+</script>

package/templates/component-button-story/[component.name].story.vue

@@ -0,0 +1,77 @@
+<template>
+    <Story :layout="{ type: 'grid' }">
+        <Variant title="Playground">
+            <<% component.name %> :color="color">
+                {{ content }}
+            </<% component.name %>>
+
+            <template #controls>
+                <HstText v-model="content" title="Content" />
+                <HstSelect v-model="color" title="Color" :options="colorOptions" />
+            </template>
+        </Variant>
+
+        <Variant title="Default">
+            <<% component.name %>>
+                Click me!
+            </<% component.name %>>
+        </Variant>
+
+        <Variant title="Hover">
+            <<% component.name %> class=":hover">
+                Click me!
+            </<% component.name %>>
+        </Variant>
+
+        <Variant title="Focus">
+            <<% component.name %> class=":focus :focus-visible">
+                Click me!
+            </<% component.name %>>
+        </Variant>
+
+        <Variant title="Disabled">
+            <<% component.name %> disabled>
+                You can't click me
+            </<% component.name %>>
+        </Variant>
+
+        <Variant title="Colors" :layout="{ width: '300px' }">
+            <div class="flex items-center gap-2">
+                <<% component.name %> color="primary">
+                    Primary
+                </<% component.name %>>
+                <<% component.name %> color="secondary">
+                    Secondary
+                </<% component.name %>>
+                <<% component.name %> color="danger">
+                    Danger
+                </<% component.name %>>
+                <<% component.name %> color="clear">
+                    Clear
+                </<% component.name %>>
+            </div>
+        </Variant>
+    </Story>
+</template>
+
+<script setup lang="ts">
+import { Colors } from '@aerogel/core';
+import { invert } from '@noeldemartin/utils';
+import { ref } from 'vue';
+import type { Color } from '@aerogel/core';
+
+const content = ref('Click me!');
+const color = ref<Color>(Colors.Primary);
+const colorOptions = invert(Colors);
+</script>
+
+<style>
+.story-<% component.slug %> {
+    grid-template-columns: repeat(2, 300px) !important;
+}
+
+.story-<% component.slug %> .variant-playground,
+.story-<% component.slug %> .variant-colors{
+    grid-column: 1 / -1;
+}
+</style>

package/templates/component-checkbox/[component.name].vue

@@ -0,0 +1,34 @@
+<template>
+    <AGHeadlessInput
+        ref="$input"
+        :name="name"
+        :class="className"
+        :label="label"
+    >
+        <AGHeadlessInputInput
+            v-bind="attrs"
+            type="checkbox"
+        />
+        <div v-if="$slots.default">
+            <AGHeadlessInputLabel>
+                <slot />
+            </AGHeadlessInputLabel>
+            <AGHeadlessInputError />
+        </div>
+    </AGHeadlessInput>
+</template>
+
+<script setup lang="ts">
+import { AGHeadlessInputLabel, componentRef, stringProp, useInputAttrs } from '@aerogel/core';
+import type { IAGHeadlessInput } from '@aerogel/core';
+
+defineOptions({ inheritAttrs: false });
+defineProps({
+    name: stringProp(),
+    label: stringProp(),
+    inputClass: stringProp(''),
+});
+
+const $input = componentRef<IAGHeadlessInput>();
+const [attrs, className] = useInputAttrs();
+</script>

package/templates/component-checkbox-story/[component.name].story.vue

@@ -0,0 +1,63 @@
+<template>
+    <Story group="base" :layout="{ type: 'grid' }">
+        <Variant title="Playground">
+            <AGForm :form="form" class="m-1">
+                <<% component.name %> name="accept" :form="form">
+                    {{ label }}
+                </<% component.name %>>
+            </AGForm>
+
+            <template #controls>
+                <HstText v-model="label" title="Label" />
+            </template>
+        </Variant>
+
+        <Variant title="Default">
+            <<% component.name %> class="m-1">
+                Accept Terms & Conditions
+            </<% component.name %>>
+        </Variant>
+
+        <Variant title="Hover">
+            <<% component.name %> class="m-1" input-class=":hover">
+                Accept Terms & Conditions
+            </<% component.name %>>
+        </Variant>
+
+        <Variant title="Focus">
+            <<% component.name %> class="m-1" input-class=":focus :focus-visible">
+                Accept Terms & Conditions
+            </<% component.name %>>
+        </Variant>
+
+        <Variant title="Error">
+            <AGForm :form="errorForm" class="m-1">
+                <<% component.name %> name="accept">
+                    Accept Terms & Conditions
+                </<% component.name %>>
+            </AGForm>
+        </Variant>
+    </Story>
+</template>
+
+<script setup lang="ts">
+import { requiredBooleanInput, useForm } from '@aerogel/core';
+import { ref } from 'vue';
+
+const form = useForm({ accept: requiredBooleanInput(true) });
+const errorForm = useForm({ accept: requiredBooleanInput() });
+const label = ref('Accept Terms & Conditions');
+
+form.submit();
+errorForm.submit();
+</script>
+
+<style>
+.story-<% component.slug %> {
+    grid-template-columns: repeat(2, 300px) !important;
+}
+
+.story-<% component.slug %> .variant-playground {
+    grid-column: 1 / -1;
+}
+</style>

package/templates/component-input/[component.name].vue

@@ -2,6 +2,7 @@
     <AGHeadlessInput v-bind="props">
         <AGHeadlessInputLabel />
         <AGHeadlessInputInput v-bind="attrs" />
+        <AGHeadlessInputDescription />
         <AGHeadlessInputError />
     </AGHeadlessInput>
 </template>

package/templates/overrides/components/index.ts

@@ -0,0 +1,15 @@
+import { UIComponents } from '@aerogel/core';
+
+import AlertModal from './overrides/AlertModal.vue';
+import ConfirmModal from './overrides/ConfirmModal.vue';
+import ErrorReportModal from './overrides/ErrorReportModal.vue';
+import LoadingModal from './overrides/LoadingModal.vue';
+import SnackbarNotification from './overrides/SnackbarNotification.vue';
+
+export const components = {
+    [UIComponents.AlertModal]: AlertModal,
+    [UIComponents.ConfirmModal]: ConfirmModal,
+    [UIComponents.ErrorReportModal]: ErrorReportModal,
+    [UIComponents.LoadingModal]: LoadingModal,
+    [UIComponents.Snackbar]: SnackbarNotification,
+};

package/templates/overrides/components/overrides/AlertModal.vue

@@ -0,0 +1,11 @@
+<template>
+    <ModalWrapper :title="title">
+        <AGMarkdown :text="message" />
+    </ModalWrapper>
+</template>
+
+<script setup lang="ts">
+import { useAlertModalProps } from '@aerogel/core';
+
+defineProps(useAlertModalProps());
+</script>

package/templates/overrides/components/overrides/ConfirmModal.vue

@@ -0,0 +1,20 @@
+<template>
+    <ModalWrapper v-slot="{ close }" :title="title" :cancellable="false">
+        <AGMarkdown :text="message" />
+        <div class="mt-4 flex flex-row-reverse">
+            <AGButton :color="acceptColor" @click="close(true)">
+                {{ renderedAcceptText }}
+            </AGButton>
+            <AGButton :color="cancelColor" class="mr-2" @click="close(false)">
+                {{ renderedCancelText }}
+            </AGButton>
+        </div>
+    </ModalWrapper>
+</template>
+
+<script setup lang="ts">
+import { useConfirmModal, useConfirmModalProps } from '@aerogel/core';
+
+const props = defineProps(useConfirmModalProps());
+const { renderedAcceptText, renderedCancelText } = useConfirmModal(props);
+</script>

package/templates/overrides/components/overrides/ErrorReportModal.vue

@@ -0,0 +1,35 @@
+<template>
+    <ModalWrapper>
+        <AGErrorReportModalTitle
+            :report="report"
+            :current-report="activeReportIndex + 1"
+            :total-reports="reports.length"
+        />
+        <AGButton color="clear" :disabled="activeReportIndex === 0" @click="activeReportIndex--">
+            {{ previousReportText }}
+        </AGButton>
+        <AGButton color="clear" :disabled="activeReportIndex === reports.length - 1" @click="activeReportIndex++">
+            {{ nextReportText }}
+        </AGButton>
+        <AGErrorReportModalButtons :report="report">
+            <template
+                #default="{ url, handler, iconComponent, description }: IAGErrorReportModalButtonsDefaultSlotProps"
+            >
+                <AGButton :url="url" :aria-label="description" @click="handler">
+                    <component :is="iconComponent" />
+                    {{ description }}
+                </AGButton>
+            </template>
+        </AGErrorReportModalButtons>
+        <AGMarkdown v-if="report.description" :text="report.description" />
+        <pre v-text="details" />
+    </ModalWrapper>
+</template>
+
+<script setup lang="ts">
+import { useErrorReportModal, useErrorReportModalProps } from '@aerogel/core';
+import type { IAGErrorReportModalButtonsDefaultSlotProps } from '@aerogel/core';
+
+const props = defineProps(useErrorReportModalProps());
+const { activeReportIndex, details, nextReportText, previousReportText, report } = useErrorReportModal(props);
+</script>

package/templates/overrides/components/overrides/LoadingModal.vue

@@ -0,0 +1,12 @@
+<template>
+    <ModalWrapper :cancellable="false">
+        <AGMarkdown :text="renderedMessage" />
+    </ModalWrapper>
+</template>
+
+<script setup lang="ts">
+import { useLoadingModal, useLoadingModalProps } from '@aerogel/core';
+
+const props = defineProps(useLoadingModalProps());
+const { renderedMessage } = useLoadingModal(props);
+</script>

package/templates/overrides/components/overrides/ModalWrapper.vue

@@ -0,0 +1,22 @@
+<template>
+    <AGHeadlessModal ref="$modal" v-slot="{ close }" v-bind="props">
+        <AGHeadlessModalPanel>
+            <AGHeadlessModalTitle v-if="title">
+                <AGMarkdown :text="title" inline />
+            </AGHeadlessModalTitle>
+            <slot :close="close" />
+        </AGHeadlessModalPanel>
+    </AGHeadlessModal>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { useModalExpose, useModalProps } from '@aerogel/core';
+import type { IAGHeadlessModal, IAGModal } from '@aerogel/core';
+
+const props = defineProps(useModalProps());
+const $modal = ref<IAGHeadlessModal>();
+
+defineOptions({ inheritAttrs: false });
+defineExpose<IAGModal>(useModalExpose($modal));
+</script>

package/templates/overrides/components/overrides/SnackbarNotification.vue

@@ -0,0 +1,34 @@
+<template>
+    <AGHeadlessSnackbar :class="colorClasses">
+        <AGMarkdown :text="message" inline />
+
+        <AGButton
+            v-for="(action, i) of actions"
+            :key="i"
+            :color="color"
+            @click="activate(action)"
+        >
+            {{ action.text }}
+        </AGButton>
+    </AGHeadlessSnackbar>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue';
+import { Colors, useSnackbar, useSnackbarProps } from '@aerogel/core';
+
+const props = defineProps(useSnackbarProps());
+const { activate } = useSnackbar(props);
+
+const colorClasses = computed(() => {
+    switch (props.color) {
+        case Colors.Danger:
+            // Add your custom color classes here.
+            return '';
+        case Colors.Secondary:
+        default:
+            // Add your custom color classes here.
+            return '';
+    }
+});
+</script>

package/templates/overrides-story/Overrides.story.vue

@@ -0,0 +1,86 @@
+<template>
+    <Story :layout="{ type: 'grid', width: '90%' }">
+        <Variant title="Playground">
+            <div class="flex space-x-3">
+                <AGButton @click="$ui.alert(alertTitle, alertMessage)">
+                    Alert
+                </AGButton>
+                <AGButton @click="$ui.confirm(confirmTitle, confirmMessage)">
+                    Confirm
+                </AGButton>
+                <AGButton @click="$ui.loading(loadingMessage, after({ seconds: loadingDuration }))">
+                    Loading
+                </AGButton>
+                <AGButton @click="$ui.showSnackbar(snackbarMessage, snackbarOptions)">
+                    Snackbar
+                </AGButton>
+                <AGButton @click="$errors.inspect(errorReports)">
+                    Error Report
+                </AGButton>
+            </div>
+
+            <AGAppOverlays />
+
+            <template #controls>
+                <HstText v-model="alertTitle" title="Alert Title" />
+                <HstText v-model="alertMessage" title="Alert Message" />
+                <HstText v-model="confirmTitle" title="Confirm Title" />
+                <HstText v-model="confirmMessage" title="Confirm Message" />
+                <HstText v-model="loadingMessage" title="Loading Message" />
+                <HstNumber v-model="loadingDuration" title="Loading Duration" />
+                <HstText v-model="snackbarMessage" title="Snackbar Message" />
+                <HstSelect v-model="snackbarColor" title="Snackbar Color" :options="snackbarColors" />
+                <HstText v-model="snackbarAction" title="Snackbar Action" />
+                <HstText v-model="errorReportTitle" title="Error Report Title" />
+                <HstText v-model="errorReportDescription" title="Error Report Description" />
+            </template>
+        </Variant>
+    </Story>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { after, invert } from '@noeldemartin/utils';
+import { Colors, SnackbarColors } from '@aerogel/core';
+import type { ErrorReport, ShowSnackbarOptions } from '@aerogel/core';
+
+const alertTitle = ref('Something important happened');
+const alertMessage = ref('And here you can read the details...');
+const confirmTitle = ref('Confirmation');
+const confirmMessage = ref('Are you sure?');
+const loadingMessage = ref('Loading...');
+const loadingDuration = ref(3);
+const snackbarMessage = ref('Something happened');
+const snackbarColor = ref(Colors.Secondary);
+const snackbarColors = invert(SnackbarColors);
+const snackbarAction = ref('Ok');
+const snackbarOptions = computed((): ShowSnackbarOptions => {
+    if (!snackbarAction.value) {
+        return {};
+    }
+
+    return {
+        color: snackbarColor.value,
+        actions: [
+            {
+                text: snackbarAction.value,
+                dismiss: true,
+            },
+        ],
+    };
+});
+const errorReportTitle = ref('Error');
+const errorReportDescription = ref('Something went wrong!');
+const errorReports = computed((): ErrorReport[] => [
+    {
+        title: errorReportTitle.value,
+        description: errorReportDescription.value,
+        details: new Error().stack,
+    },
+    {
+        title: errorReportTitle.value,
+        description: errorReportDescription.value,
+        details: new Error().stack,
+    },
+]);
+</script>

package/templates/postcss-pseudo-classes/postcss.config.js

@@ -0,0 +1,15 @@
+const plugins = {
+    tailwindcss: {},
+    autoprefixer: {},
+};
+
+if (process.env.NODE_ENV === 'development') {
+    plugins['postcss-pseudo-classes'] = {
+        blacklist: [],
+        restrictTo: ['focus', 'focus-visible', 'focus-within', 'hover'],
+        allCombinations: true,
+        preserveBeforeAfter: false,
+    };
+}
+
+module.exports = { plugins };

package/templates/service/[service.name].ts

@@ -5,4 +5,4 @@ export class <% service.name %>Service extends Service {
 
 }
 
-export default facade(new <% service.name %>Service());
+export default facade(<% service.name %>Service);