Merge pull request #672 from codigoencasa/feat/upgrade-npm

Feat/upgrade npm

.github/workflows/releases-dev.yml

@@ -38,9 +38,11 @@ jobs:
               run: pnpm build:full
 
             - uses: actions/cache@v3
+              env:
+                  cache-name: cache-node-modules
               with:
                   path: ./packages
-                  key: packages-key
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-workspace.yaml') }}
     release:
         name: Release DEV
         runs-on: ubuntu-latest
@@ -71,9 +73,15 @@ jobs:
               run: pnpm install --frozen-lockfile
 
             - uses: actions/cache@v3
+              env:
+                  cache-name: cache-node-modules
               with:
                   path: ./packages
-                  key: packages-key
+                  key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-workspace.yaml') }}
+
+            - name: get-npm-version
+              id: package-version
+              uses: martinbeentjes/npm-get-version-action@main
 
             - name: Release @bot-whatsapp/bot
               run: node ./scripts/release.js --name=bot --version=  --token="${{ secrets.NPM_TOKEN }}"

__test__/0.1.4-case.test.js

@@ -159,4 +159,94 @@ suiteCase(`Responder con un "object"`, async ({ database, provider }) => {
     assert.is(undefined, getHistory[3])
 })
 
+suiteCase(`FlowDynamic con capture`, async ({ database, provider }) => {
+    const flow = addKeyword(['hola'])
+        .addAnswer(
+            'Como vas?: dime "bien" sino entro en fallback',
+            { capture: true },
+            async (ctx, { flowDynamic, fallBack }) => {
+                if (ctx.body !== 'bien') return fallBack()
+                return flowDynamic([{ body: 'Todo bien!' }])
+            }
+        )
+        .addAnswer('fin!')
+
+    createBot({
+        database,
+        provider,
+        flow: createFlow([flow]),
+    })
+
+    await provider.delaySendMessage(0, 'message', {
+        from: '000',
+        body: 'hola',
+    })
+
+    await provider.delaySendMessage(10, 'message', {
+        from: '000',
+        body: 'mal',
+    })
+
+    await provider.delaySendMessage(20, 'message', {
+        from: '000',
+        body: 'bien',
+    })
+
+    await delay(100)
+    const getHistory = database.listHistory.map((i) => i.answer)
+    assert.is('Como vas?: dime "bien" sino entro en fallback', getHistory[0])
+    assert.is('mal', getHistory[1])
+    assert.is('Como vas?: dime "bien" sino entro en fallback', getHistory[2])
+    assert.is('bien', getHistory[3])
+    assert.is('Todo bien!', getHistory[4])
+    assert.is('fin!', getHistory[5])
+    assert.is(undefined, getHistory[6])
+})
+
+suiteCase.skip(`FlowDynamic con capture en hijo`, async ({ database, provider }) => {
+    // const flowTres = addKeyword('flowTres').addAnswer('Soy flujo 3',null,null,[flowTres]).addAnswer('Soy flujo 3-1')
+
+    const flowDos = addKeyword('flowDos').addAnswer('Soy flujo 2').addAnswer('Soy flujo 2-1')
+
+    const flow = addKeyword(['hola']).addAnswer(
+        'Buenas!',
+        { capture: true },
+        async (_, { flowDynamic }) => {
+            return flowDynamic('Escribe flowDos')
+        },
+        [flowDos]
+    )
+
+    createBot({
+        database,
+        provider,
+        flow: createFlow([flow]),
+    })
+
+    await provider.delaySendMessage(0, 'message', {
+        from: '000',
+        body: 'hola',
+    })
+
+    await provider.delaySendMessage(10, 'message', {
+        from: '000',
+        body: 'mirame',
+    })
+
+    await provider.delaySendMessage(20, 'message', {
+        from: '000',
+        body: 'flowDos',
+    })
+
+    await delay(100)
+    const getHistory = database.listHistory.map((i) => i.answer)
+    assert.is('Buenas!', getHistory[0])
+    assert.is('mirame', getHistory[1])
+    assert.is('Escribe flowDos', getHistory[2])
+    assert.is('flowDos', getHistory[3])
+    assert.is('Soy flujo 2', getHistory[4])
+    // assert.is('Soy flujo 2-1', getHistory[5])
+    // assert.is(undefined, getHistory[7])
+})
+
 suiteCase.run()

packages/cli/interactive/index.js

@@ -6,10 +6,13 @@ const { existsSync, readFileSync } = require('fs')
 const { copyBaseApp } = require('../create-app')
 const { checkNodeVersion, checkGit } = require('../check')
 
-const PATH_BASE = join(process.cwd())
+const PATH_BASE = [
+    join(__dirname, '..', '..', 'package.json'),
+    // join(process.cwd(),'package.json'),
+].find((i) => existsSync(i))
 
 const pkgJson = () => {
-    const pkgJson = join(PATH_BASE, 'package.json')
+    const pkgJson = PATH_BASE
     const rawFile = readFileSync(pkgJson, 'utf-8')
     return JSON.parse(rawFile)
 }

packages/docs/src/components/core/Social.tsx

@@ -1,39 +1,6 @@
 export const Social = () => {
     return (
         <>
-            {/* <title>
-                💻 Conviértete en un Programador Backend aprendiendo todo de
-                Cloud y Nodejs
-            </title>
-            <meta
-                property="og:site_name"
-                content="💻 Conviértete en un Programador Backend aprendiendo todo de Cloud y Nodejs"
-            />
-
-            <meta
-                name="description"
-                content="🚀 Comienza haciendo tus despliegues  directamente a la Nube. 🙌 Qué esperas mejorar  tus habilidades en la programación ahora mismo."
-            />
-            <meta property="og:type" content="website" />
-            <meta
-                name="keywords"
-                content="cursos programacion, cursos backend, curso de aws, curso de cloud computing, curso de node, curso de typescript, curso de api rest con node, curso de api rest con mongo, curso de api rest con aws"
-            />
-            <meta
-                property="og:title"
-                content="💻 Conviértete en un Programador Backend aprendiendo todo de Cloud Computing y Nodejs"
-            />
-            <meta
-                property="og:description"
-                content="🚀 Comienza haciendo tus despliegues  directamente a la Nube. 🙌 Qué esperas mejorar  tus habilidades en la programación ahora mismo."
-            />
-            <meta property="og:type" content="article" />
-            <meta property="og:locale" content="es_ES" />
-            <meta
-                property="og:url"
-                content="https://campaign.codigoencasa.com"
-            />
-            <meta property="og:site_name" content="campaign.codigoencasa.com" /> */}
             <meta property="og:image" content="https://i.imgur.com/0HpzsEm.png"></meta>
             <meta property="og:image:secure_url" content="https://i.imgur.com/0HpzsEm.png" />
             <meta property="og:image:type" content="image/png"></meta>

packages/docs/src/components/widgets/Header.tsx

@@ -5,7 +5,7 @@ import ToggleTheme from '~/components/core/ToggleTheme'
 import ToggleMenu from '~/components/core/ToggleMenu'
 import { IconDiscord } from '../icons/IconDiscord'
 import { GlobalStore } from '~/contexts'
-import { Algolia } from '~/integrations/react/docsearch'
+// import { Algolia } from '~/integrations/react/docsearch'
 
 export default component$(() => {
     const storeScroll = useStore({
@@ -36,7 +36,7 @@ export default component$(() => {
                         <Logo /> 
                     </a>
                     <div class="flex items-center content-center">
-                        <Algolia />
+                        {/* <Algolia /> */}
                     </div>
                     <div class="flex items-center md:hidden">
                         <ToggleTheme iconClass="w-6 h-6" />

packages/docs/src/integrations/react/docsearch.tsx

@@ -1,20 +1,20 @@
 
-import { qwikify$ } from '@builder.io/qwik-react';
-import { DocSearch } from '@docsearch/react';
-import { component$ } from '@builder.io/qwik';
+// import { qwikify$ } from '@builder.io/qwik-react';
+// import { DocSearch } from '@docsearch/react';
+// import { component$ } from '@builder.io/qwik';
 
-export const DocSearch$ = qwikify$(DocSearch,{eagerness:'visible'});
+// export const DocSearch$ = qwikify$(DocSearch);
 
-export const Algolia = component$(() => {
-    return(
-        <>
-          <div class="">
-                <DocSearch$
-                appId="3G2WXK7FDH"
-                apiKey="0a551503db005c5575ddb5fd5a7fbf50"
-                indexName="bot"
-                />
-            </div>
-        </>
-    )
-})
+// export const Algolia = component$(() => {
+//     return(
+//         <>
+//           <div class="">
+//                 <DocSearch$
+//                 appId="3G2WXK7FDH"
+//                 apiKey="0a551503db005c5575ddb5fd5a7fbf50"
+//                 indexName="bot"
+//                 />
+//             </div>
+//         </>
+//     )
+// })

packages/docs/src/root.tsx

@@ -71,7 +71,8 @@ export default component$(() => {
                 <meta charSet="utf-8" />
                 <meta name="viewport" content="width=device-width, initial-scale=1" />
                 <link rel="manifest" href="/manifest.json" />
-                <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3" />
+                {/* <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3" /> */}
+                {/* <script src="https://cdn.jsdelivr.net/npm/@docsearch/js@3"></script> */}
                 <RouterHead />
                 <DarkThemeLauncher />
                 <Social />